From 1db00568787bb6c0d4e6968de1ac98a396803d76 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Mon, 12 Aug 2024 09:31:36 +0000 Subject: [PATCH 01/27] ECC-1882: GRIB2: Adapt recently added On-Demand DT encodings to fit generalised approach --- definitions/grib1/localConcepts/ecmf/name.def | 5 - .../grib1/localConcepts/ecmf/paramId.def | 5 - .../grib1/localConcepts/ecmf/shortName.def | 5 - .../grib1/localConcepts/ecmf/units.def | 5 - definitions/grib2/name.def | 104 +++++++++--------- definitions/grib2/paramId.def | 104 +++++++++--------- definitions/grib2/shortName.def | 104 +++++++++--------- definitions/grib2/units.def | 104 +++++++++--------- 8 files changed, 208 insertions(+), 228 deletions(-) diff --git a/definitions/grib1/localConcepts/ecmf/name.def b/definitions/grib1/localConcepts/ecmf/name.def index 77d5535a7..5c89d1280 100644 --- a/definitions/grib1/localConcepts/ecmf/name.def +++ b/definitions/grib1/localConcepts/ecmf/name.def @@ -15024,11 +15024,6 @@ table2Version = 172 ; indicatorOfParameter = 147 ; } -#Time-mean surface net radiation flux (SW and LW) -'Time-mean surface net radiation flux (SW and LW)' = { - table2Version = 172 ; - indicatorOfParameter = 149 ; - } #Mean short-wave heating rate 'Mean short-wave heating rate' = { table2Version = 172 ; diff --git a/definitions/grib1/localConcepts/ecmf/paramId.def b/definitions/grib1/localConcepts/ecmf/paramId.def index 0ea5b7ea3..f4dd85c70 100644 --- a/definitions/grib1/localConcepts/ecmf/paramId.def +++ b/definitions/grib1/localConcepts/ecmf/paramId.def @@ -15024,11 +15024,6 @@ table2Version = 172 ; indicatorOfParameter = 147 ; } -#Time-mean surface net radiation flux (SW and LW) -'172149' = { - table2Version = 172 ; - indicatorOfParameter = 149 ; - } #Mean short-wave heating rate '172153' = { table2Version = 172 ; diff --git a/definitions/grib1/localConcepts/ecmf/shortName.def b/definitions/grib1/localConcepts/ecmf/shortName.def index 4eb5e6f67..176da8fca 100644 --- a/definitions/grib1/localConcepts/ecmf/shortName.def +++ b/definitions/grib1/localConcepts/ecmf/shortName.def @@ -15024,11 +15024,6 @@ table2Version = 172 ; indicatorOfParameter = 147 ; } -#Time-mean surface net radiation flux (SW and LW) -'msnrf' = { - table2Version = 172 ; - indicatorOfParameter = 149 ; - } #Mean short-wave heating rate 'mswhr' = { table2Version = 172 ; diff --git a/definitions/grib1/localConcepts/ecmf/units.def b/definitions/grib1/localConcepts/ecmf/units.def index bc63e7cd7..dae3279fd 100644 --- a/definitions/grib1/localConcepts/ecmf/units.def +++ b/definitions/grib1/localConcepts/ecmf/units.def @@ -15024,11 +15024,6 @@ table2Version = 172 ; indicatorOfParameter = 147 ; } -#Time-mean surface net radiation flux (SW and LW) -'W m**-2' = { - table2Version = 172 ; - indicatorOfParameter = 149 ; - } #Mean short-wave heating rate 'K s**-1' = { table2Version = 172 ; diff --git a/definitions/grib2/name.def b/definitions/grib2/name.def index 9db74ef7c..182b8fe4e 100644 --- a/definitions/grib2/name.def +++ b/definitions/grib2/name.def @@ -3539,14 +3539,6 @@ parameterNumber = 46 ; typeOfFirstFixedSurface = 8 ; } -#Time-mean top net radiation flux (SW and LW) -'Time-mean top net radiation flux (SW and LW)' = { - discipline = 0 ; - parameterCategory = 19 ; - parameterNumber = 46 ; - typeOfFirstFixedSurface = 8 ; - typeOfStatisticalProcessing = 0 ; - } #Global irradiance on tilted surfaces 'Global irradiance on tilted surfaces' = { discipline = 0 ; @@ -3705,22 +3697,6 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Maximum total column integrated graupel (snow pellets) -'Maximum total column integrated graupel (snow pellets)' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 74 ; - typeOfFirstFixedSurface = 1 ; - typeOfSecondFixedSurface = 8 ; - typeOfStatisticalProcessing = 2 ; - } -#Minimum visibility -'Minimum visibility' = { - discipline = 0 ; - parameterCategory = 19 ; - parameterNumber = 0 ; - typeOfStatisticalProcessing = 3 ; - } #Geometric height of theta level above ground 'Geometric height of theta level above ground' = { discipline = 0 ; @@ -3845,26 +3821,6 @@ parameterNumber = 16 ; typeOfFirstFixedSurface = 1 ; } -#Time-maximum 2 metre relative humidity -'Time-maximum 2 metre relative humidity' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 1 ; - typeOfFirstFixedSurface = 103 ; - scaledValueOfFirstFixedSurface = 2 ; - scaleFactorOfFirstFixedSurface = 0 ; - typeOfStatisticalProcessing = 2 ; - } -#Time-minimum 2 metre relative humidity -'Time-minimum 2 metre relative humidity' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 1 ; - typeOfFirstFixedSurface = 103 ; - scaledValueOfFirstFixedSurface = 2 ; - scaleFactorOfFirstFixedSurface = 0 ; - typeOfStatisticalProcessing = 3 ; - } #Surface roughness for heat 'Surface roughness for heat' = { discipline = 0 ; @@ -5127,6 +5083,22 @@ parameterNumber = 12 ; typeOfStatisticalProcessing = 0 ; } +#Time-mean surface net radiation flux (SW and LW) +'Time-mean surface net radiation flux (SW and LW)' = { + discipline = 0 ; + parameterCategory = 19 ; + parameterNumber = 46 ; + typeOfFirstFixedSurface = 1 ; + typeOfStatisticalProcessing = 0 ; + } +#Time-mean top net radiation flux (SW and LW) +'Time-mean top net radiation flux (SW and LW)' = { + discipline = 0 ; + parameterCategory = 19 ; + parameterNumber = 46 ; + typeOfFirstFixedSurface = 8 ; + typeOfStatisticalProcessing = 0 ; + } #Time-mean mean sea level pressure 'Time-mean mean sea level pressure' = { discipline = 0 ; @@ -5348,6 +5320,16 @@ parameterNumber = 25 ; typeOfStatisticalProcessing = 2 ; } +#Time-maximum 2 metre relative humidity +'Time-maximum 2 metre relative humidity' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 1 ; + typeOfFirstFixedSurface = 103 ; + scaledValueOfFirstFixedSurface = 2 ; + scaleFactorOfFirstFixedSurface = 0 ; + typeOfStatisticalProcessing = 2 ; + } #Time-maximum most-unstable CAPE 'Time-maximum most-unstable CAPE' = { discipline = 0 ; @@ -5358,6 +5340,15 @@ scaleFactorOfFirstFixedSurface = missing() ; typeOfStatisticalProcessing = 2 ; } +#Time-maximum total column vertically-integrated graupel (snow pellets) +'Time-maximum total column vertically-integrated graupel (snow pellets)' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 74 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + typeOfStatisticalProcessing = 2 ; + } #Time-minimum volumetric soil moisture 'Time-minimum volumetric soil moisture' = { discipline = 2 ; @@ -5365,6 +5356,23 @@ parameterNumber = 25 ; typeOfStatisticalProcessing = 3 ; } +#Time-minimum 2 metre relative humidity +'Time-minimum 2 metre relative humidity' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 1 ; + typeOfFirstFixedSurface = 103 ; + scaledValueOfFirstFixedSurface = 2 ; + scaleFactorOfFirstFixedSurface = 0 ; + typeOfStatisticalProcessing = 3 ; + } +#Time-minimum visibility +'Time-minimum visibility' = { + discipline = 0 ; + parameterCategory = 19 ; + parameterNumber = 0 ; + typeOfStatisticalProcessing = 3 ; + } #Time-minimum most-unstable CAPE 'Time-minimum most-unstable CAPE' = { discipline = 0 ; @@ -11061,14 +11069,6 @@ parameterNumber = 40 ; typeOfStatisticalProcessing = 1 ; } -#Time-mean surface net radiation flux (SW and LW) -'Time-mean surface net radiation flux (SW and LW)' = { - discipline = 0 ; - parameterCategory = 19 ; - parameterNumber = 46 ; - typeOfFirstFixedSurface = 1 ; - typeOfStatisticalProcessing = 0 ; - } #Surface runoff 'Surface runoff' = { discipline = 2 ; diff --git a/definitions/grib2/paramId.def b/definitions/grib2/paramId.def index 670e477af..601455452 100644 --- a/definitions/grib2/paramId.def +++ b/definitions/grib2/paramId.def @@ -3539,14 +3539,6 @@ parameterNumber = 46 ; typeOfFirstFixedSurface = 8 ; } -#Time-mean top net radiation flux (SW and LW) -'231020' = { - discipline = 0 ; - parameterCategory = 19 ; - parameterNumber = 46 ; - typeOfFirstFixedSurface = 8 ; - typeOfStatisticalProcessing = 0 ; - } #Global irradiance on tilted surfaces '231021' = { discipline = 0 ; @@ -3705,22 +3697,6 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Maximum total column integrated graupel (snow pellets) -'231042' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 74 ; - typeOfFirstFixedSurface = 1 ; - typeOfSecondFixedSurface = 8 ; - typeOfStatisticalProcessing = 2 ; - } -#Minimum visibility -'231043' = { - discipline = 0 ; - parameterCategory = 19 ; - parameterNumber = 0 ; - typeOfStatisticalProcessing = 3 ; - } #Geometric height of theta level above ground '231044' = { discipline = 0 ; @@ -3845,26 +3821,6 @@ parameterNumber = 16 ; typeOfFirstFixedSurface = 1 ; } -#Time-maximum 2 metre relative humidity -'231061' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 1 ; - typeOfFirstFixedSurface = 103 ; - scaledValueOfFirstFixedSurface = 2 ; - scaleFactorOfFirstFixedSurface = 0 ; - typeOfStatisticalProcessing = 2 ; - } -#Time-minimum 2 metre relative humidity -'231062' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 1 ; - typeOfFirstFixedSurface = 103 ; - scaledValueOfFirstFixedSurface = 2 ; - scaleFactorOfFirstFixedSurface = 0 ; - typeOfStatisticalProcessing = 3 ; - } #Surface roughness for heat '231063' = { discipline = 0 ; @@ -5127,6 +5083,22 @@ parameterNumber = 12 ; typeOfStatisticalProcessing = 0 ; } +#Time-mean surface net radiation flux (SW and LW) +'235149' = { + discipline = 0 ; + parameterCategory = 19 ; + parameterNumber = 46 ; + typeOfFirstFixedSurface = 1 ; + typeOfStatisticalProcessing = 0 ; + } +#Time-mean top net radiation flux (SW and LW) +'235150' = { + discipline = 0 ; + parameterCategory = 19 ; + parameterNumber = 46 ; + typeOfFirstFixedSurface = 8 ; + typeOfStatisticalProcessing = 0 ; + } #Time-mean mean sea level pressure '235151' = { discipline = 0 ; @@ -5348,6 +5320,16 @@ parameterNumber = 25 ; typeOfStatisticalProcessing = 2 ; } +#Time-maximum 2 metre relative humidity +'237092' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 1 ; + typeOfFirstFixedSurface = 103 ; + scaledValueOfFirstFixedSurface = 2 ; + scaleFactorOfFirstFixedSurface = 0 ; + typeOfStatisticalProcessing = 2 ; + } #Time-maximum most-unstable CAPE '237117' = { discipline = 0 ; @@ -5358,6 +5340,15 @@ scaleFactorOfFirstFixedSurface = missing() ; typeOfStatisticalProcessing = 2 ; } +#Time-maximum total column vertically-integrated graupel (snow pellets) +'237120' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 74 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + typeOfStatisticalProcessing = 2 ; + } #Time-minimum volumetric soil moisture '238077' = { discipline = 2 ; @@ -5365,6 +5356,23 @@ parameterNumber = 25 ; typeOfStatisticalProcessing = 3 ; } +#Time-minimum 2 metre relative humidity +'238092' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 1 ; + typeOfFirstFixedSurface = 103 ; + scaledValueOfFirstFixedSurface = 2 ; + scaleFactorOfFirstFixedSurface = 0 ; + typeOfStatisticalProcessing = 3 ; + } +#Time-minimum visibility +'238105' = { + discipline = 0 ; + parameterCategory = 19 ; + parameterNumber = 0 ; + typeOfStatisticalProcessing = 3 ; + } #Time-minimum most-unstable CAPE '238117' = { discipline = 0 ; @@ -11061,14 +11069,6 @@ parameterNumber = 40 ; typeOfStatisticalProcessing = 1 ; } -#Time-mean surface net radiation flux (SW and LW) -'172149' = { - discipline = 0 ; - parameterCategory = 19 ; - parameterNumber = 46 ; - typeOfFirstFixedSurface = 1 ; - typeOfStatisticalProcessing = 0 ; - } #Surface runoff '174008' = { discipline = 2 ; diff --git a/definitions/grib2/shortName.def b/definitions/grib2/shortName.def index 81e6cd53a..1ae881b50 100644 --- a/definitions/grib2/shortName.def +++ b/definitions/grib2/shortName.def @@ -3539,14 +3539,6 @@ parameterNumber = 46 ; typeOfFirstFixedSurface = 8 ; } -#Time-mean top net radiation flux (SW and LW) -'mtnrf' = { - discipline = 0 ; - parameterCategory = 19 ; - parameterNumber = 46 ; - typeOfFirstFixedSurface = 8 ; - typeOfStatisticalProcessing = 0 ; - } #Global irradiance on tilted surfaces 'gits' = { discipline = 0 ; @@ -3705,22 +3697,6 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Maximum total column integrated graupel (snow pellets) -'maxtcg' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 74 ; - typeOfFirstFixedSurface = 1 ; - typeOfSecondFixedSurface = 8 ; - typeOfStatisticalProcessing = 2 ; - } -#Minimum visibility -'minvis' = { - discipline = 0 ; - parameterCategory = 19 ; - parameterNumber = 0 ; - typeOfStatisticalProcessing = 3 ; - } #Geometric height of theta level above ground 'hthg' = { discipline = 0 ; @@ -3845,26 +3821,6 @@ parameterNumber = 16 ; typeOfFirstFixedSurface = 1 ; } -#Time-maximum 2 metre relative humidity -'mx2r' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 1 ; - typeOfFirstFixedSurface = 103 ; - scaledValueOfFirstFixedSurface = 2 ; - scaleFactorOfFirstFixedSurface = 0 ; - typeOfStatisticalProcessing = 2 ; - } -#Time-minimum 2 metre relative humidity -'mn2r' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 1 ; - typeOfFirstFixedSurface = 103 ; - scaledValueOfFirstFixedSurface = 2 ; - scaleFactorOfFirstFixedSurface = 0 ; - typeOfStatisticalProcessing = 3 ; - } #Surface roughness for heat 'srhe' = { discipline = 0 ; @@ -5127,6 +5083,22 @@ parameterNumber = 12 ; typeOfStatisticalProcessing = 0 ; } +#Time-mean surface net radiation flux (SW and LW) +'avg_snrf' = { + discipline = 0 ; + parameterCategory = 19 ; + parameterNumber = 46 ; + typeOfFirstFixedSurface = 1 ; + typeOfStatisticalProcessing = 0 ; + } +#Time-mean top net radiation flux (SW and LW) +'avg_tnrf' = { + discipline = 0 ; + parameterCategory = 19 ; + parameterNumber = 46 ; + typeOfFirstFixedSurface = 8 ; + typeOfStatisticalProcessing = 0 ; + } #Time-mean mean sea level pressure 'avg_msl' = { discipline = 0 ; @@ -5348,6 +5320,16 @@ parameterNumber = 25 ; typeOfStatisticalProcessing = 2 ; } +#Time-maximum 2 metre relative humidity +'max_2r' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 1 ; + typeOfFirstFixedSurface = 103 ; + scaledValueOfFirstFixedSurface = 2 ; + scaleFactorOfFirstFixedSurface = 0 ; + typeOfStatisticalProcessing = 2 ; + } #Time-maximum most-unstable CAPE 'max_mucape' = { discipline = 0 ; @@ -5358,6 +5340,15 @@ scaleFactorOfFirstFixedSurface = missing() ; typeOfStatisticalProcessing = 2 ; } +#Time-maximum total column vertically-integrated graupel (snow pellets) +'max_tcolg' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 74 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + typeOfStatisticalProcessing = 2 ; + } #Time-minimum volumetric soil moisture 'min_vsw' = { discipline = 2 ; @@ -5365,6 +5356,23 @@ parameterNumber = 25 ; typeOfStatisticalProcessing = 3 ; } +#Time-minimum 2 metre relative humidity +'min_2r' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 1 ; + typeOfFirstFixedSurface = 103 ; + scaledValueOfFirstFixedSurface = 2 ; + scaleFactorOfFirstFixedSurface = 0 ; + typeOfStatisticalProcessing = 3 ; + } +#Time-minimum visibility +'min_vis' = { + discipline = 0 ; + parameterCategory = 19 ; + parameterNumber = 0 ; + typeOfStatisticalProcessing = 3 ; + } #Time-minimum most-unstable CAPE 'min_mucape' = { discipline = 0 ; @@ -11061,14 +11069,6 @@ parameterNumber = 40 ; typeOfStatisticalProcessing = 1 ; } -#Time-mean surface net radiation flux (SW and LW) -'msnrf' = { - discipline = 0 ; - parameterCategory = 19 ; - parameterNumber = 46 ; - typeOfFirstFixedSurface = 1 ; - typeOfStatisticalProcessing = 0 ; - } #Surface runoff 'sro' = { discipline = 2 ; diff --git a/definitions/grib2/units.def b/definitions/grib2/units.def index b6ebdbf3f..a6cda2c83 100644 --- a/definitions/grib2/units.def +++ b/definitions/grib2/units.def @@ -3539,14 +3539,6 @@ parameterNumber = 46 ; typeOfFirstFixedSurface = 8 ; } -#Time-mean top net radiation flux (SW and LW) -'W m**-2' = { - discipline = 0 ; - parameterCategory = 19 ; - parameterNumber = 46 ; - typeOfFirstFixedSurface = 8 ; - typeOfStatisticalProcessing = 0 ; - } #Global irradiance on tilted surfaces 'W m**-2' = { discipline = 0 ; @@ -3705,22 +3697,6 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Maximum total column integrated graupel (snow pellets) -'kg m**-2' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 74 ; - typeOfFirstFixedSurface = 1 ; - typeOfSecondFixedSurface = 8 ; - typeOfStatisticalProcessing = 2 ; - } -#Minimum visibility -'m' = { - discipline = 0 ; - parameterCategory = 19 ; - parameterNumber = 0 ; - typeOfStatisticalProcessing = 3 ; - } #Geometric height of theta level above ground 'm' = { discipline = 0 ; @@ -3845,26 +3821,6 @@ parameterNumber = 16 ; typeOfFirstFixedSurface = 1 ; } -#Time-maximum 2 metre relative humidity -'%' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 1 ; - typeOfFirstFixedSurface = 103 ; - scaledValueOfFirstFixedSurface = 2 ; - scaleFactorOfFirstFixedSurface = 0 ; - typeOfStatisticalProcessing = 2 ; - } -#Time-minimum 2 metre relative humidity -'%' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 1 ; - typeOfFirstFixedSurface = 103 ; - scaledValueOfFirstFixedSurface = 2 ; - scaleFactorOfFirstFixedSurface = 0 ; - typeOfStatisticalProcessing = 3 ; - } #Surface roughness for heat 'm' = { discipline = 0 ; @@ -5127,6 +5083,22 @@ parameterNumber = 12 ; typeOfStatisticalProcessing = 0 ; } +#Time-mean surface net radiation flux (SW and LW) +'W m**-2' = { + discipline = 0 ; + parameterCategory = 19 ; + parameterNumber = 46 ; + typeOfFirstFixedSurface = 1 ; + typeOfStatisticalProcessing = 0 ; + } +#Time-mean top net radiation flux (SW and LW) +'W m**-2' = { + discipline = 0 ; + parameterCategory = 19 ; + parameterNumber = 46 ; + typeOfFirstFixedSurface = 8 ; + typeOfStatisticalProcessing = 0 ; + } #Time-mean mean sea level pressure 'Pa' = { discipline = 0 ; @@ -5348,6 +5320,16 @@ parameterNumber = 25 ; typeOfStatisticalProcessing = 2 ; } +#Time-maximum 2 metre relative humidity +'%' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 1 ; + typeOfFirstFixedSurface = 103 ; + scaledValueOfFirstFixedSurface = 2 ; + scaleFactorOfFirstFixedSurface = 0 ; + typeOfStatisticalProcessing = 2 ; + } #Time-maximum most-unstable CAPE 'J kg**-1' = { discipline = 0 ; @@ -5358,6 +5340,15 @@ scaleFactorOfFirstFixedSurface = missing() ; typeOfStatisticalProcessing = 2 ; } +#Time-maximum total column vertically-integrated graupel (snow pellets) +'kg m**-2' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 74 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + typeOfStatisticalProcessing = 2 ; + } #Time-minimum volumetric soil moisture 'm**3 m**-3' = { discipline = 2 ; @@ -5365,6 +5356,23 @@ parameterNumber = 25 ; typeOfStatisticalProcessing = 3 ; } +#Time-minimum 2 metre relative humidity +'%' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 1 ; + typeOfFirstFixedSurface = 103 ; + scaledValueOfFirstFixedSurface = 2 ; + scaleFactorOfFirstFixedSurface = 0 ; + typeOfStatisticalProcessing = 3 ; + } +#Time-minimum visibility +'m' = { + discipline = 0 ; + parameterCategory = 19 ; + parameterNumber = 0 ; + typeOfStatisticalProcessing = 3 ; + } #Time-minimum most-unstable CAPE 'J kg**-1' = { discipline = 0 ; @@ -11061,14 +11069,6 @@ parameterNumber = 40 ; typeOfStatisticalProcessing = 1 ; } -#Time-mean surface net radiation flux (SW and LW) -'W m**-2' = { - discipline = 0 ; - parameterCategory = 19 ; - parameterNumber = 46 ; - typeOfFirstFixedSurface = 1 ; - typeOfStatisticalProcessing = 0 ; - } #Surface runoff 'kg m**-2' = { discipline = 2 ; From 11a4563c8b50d50e6b1083aff31f5e3d337aba97 Mon Sep 17 00:00:00 2001 From: shahramn Date: Mon, 12 Aug 2024 11:54:59 +0100 Subject: [PATCH 02/27] ECC-1899: Fix the Fortran call --- fortran/eccodes_f90_tail.f90 | 6 +++--- fortran/grib_f90_tail.f90 | 6 +++--- fortran/grib_fortran.cc | 5 +++-- fortran/grib_fortran_prototypes.h | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/fortran/eccodes_f90_tail.f90 b/fortran/eccodes_f90_tail.f90 index 05d59beb5..4ecf52d03 100644 --- a/fortran/eccodes_f90_tail.f90 +++ b/fortran/eccodes_f90_tail.f90 @@ -2766,9 +2766,9 @@ end subroutine codes_skip_read_only !> Set debug mode - subroutine codes_set_debug(mode) - integer(kind=kindOfInt), intent(in) :: mode - call grib_set_debug(mode) + subroutine codes_set_debug(dmode) + integer(kind=kindOfInt), intent(in) :: dmode + call grib_set_debug(dmode) end subroutine codes_set_debug !> Set the definition path diff --git a/fortran/grib_f90_tail.f90 b/fortran/grib_f90_tail.f90 index be1a574ff..790ae3ace 100644 --- a/fortran/grib_f90_tail.f90 +++ b/fortran/grib_f90_tail.f90 @@ -3178,9 +3178,9 @@ end subroutine grib_skip_read_only !> Set debug mode - subroutine grib_set_debug(mode) - integer(kind=kindOfInt), intent(in) :: mode - call grib_f_set_debug(mode) + subroutine grib_set_debug(dmode) + integer(kind=kindOfInt), intent(in) :: dmode + call grib_f_set_debug(dmode) end subroutine grib_set_debug diff --git a/fortran/grib_fortran.cc b/fortran/grib_fortran.cc index 1539bc9db..84fe48997 100644 --- a/fortran/grib_fortran.cc +++ b/fortran/grib_fortran.cc @@ -2893,10 +2893,11 @@ int codes_f_bufr_multi_element_constant_arrays_off_(void) } /*****************************************************************************/ -void grib_f_set_debug_(int mode) +void grib_f_set_debug_(int* dmode) { + Assert(dmode); grib_context* c = grib_context_get_default(); - grib_context_set_debug(c, mode); + grib_context_set_debug(c, *dmode); } /*****************************************************************************/ diff --git a/fortran/grib_fortran_prototypes.h b/fortran/grib_fortran_prototypes.h index 7af6b2101..499ed6237 100644 --- a/fortran/grib_fortran_prototypes.h +++ b/fortran/grib_fortran_prototypes.h @@ -309,7 +309,7 @@ int grib_f_multi_append__(int *ingid, int *sec, int *mgid); int codes_f_bufr_keys_iterator_new_(int* gid,int* iterid); int grib_f_read_file_(int* fid, void* buffer, size_t* nbytes); int codes_f_bufr_keys_iterator_delete_(int* iterid); -void grib_f_set_debug_(int mode); +void grib_f_set_debug_(int* mode); int grib_f_set_definitions_path_(char* path, int len); int grib_f_read_any_from_file_(int* fid, void* buffer, size_t* nbytes); int any_f_new_from_file_(int* fid, int* gid); From 9c40c63f46047b574f6a300a299e5cb9791be1e9 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Mon, 12 Aug 2024 09:49:26 +0000 Subject: [PATCH 03/27] ECC-1895: GRIB2: Time processed equivalents for total column integrated graupel --- .../grib2/localConcepts/uerra/name.def | 9 ++++++ .../grib2/localConcepts/uerra/paramId.def | 9 ++++++ .../grib2/localConcepts/uerra/shortName.def | 9 ++++++ .../grib2/localConcepts/uerra/units.def | 9 ++++++ definitions/grib2/name.def | 31 +++++++++++++++++-- definitions/grib2/paramId.def | 29 ++++++++++++++++- definitions/grib2/shortName.def | 29 ++++++++++++++++- definitions/grib2/units.def | 29 ++++++++++++++++- 8 files changed, 149 insertions(+), 5 deletions(-) diff --git a/definitions/grib2/localConcepts/uerra/name.def b/definitions/grib2/localConcepts/uerra/name.def index da1a828b1..01f895fb5 100644 --- a/definitions/grib2/localConcepts/uerra/name.def +++ b/definitions/grib2/localConcepts/uerra/name.def @@ -367,6 +367,15 @@ scaleFactorOfFirstFixedSurface = 0 ; typeOfStatisticalProcessing = 0 ; } +#Total column vertically-integrated graupel (snow pellets) +'Total column vertically-integrated graupel (snow pellets)' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 74 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + typeOfStatisticalProcessing = 0 ; + } #Precipitation type 'Precipitation type' = { discipline = 0 ; diff --git a/definitions/grib2/localConcepts/uerra/paramId.def b/definitions/grib2/localConcepts/uerra/paramId.def index 729478df6..aeed988df 100644 --- a/definitions/grib2/localConcepts/uerra/paramId.def +++ b/definitions/grib2/localConcepts/uerra/paramId.def @@ -367,6 +367,15 @@ scaleFactorOfFirstFixedSurface = 0 ; typeOfStatisticalProcessing = 0 ; } +#Total column vertically-integrated graupel (snow pellets) +'260001' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 74 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + typeOfStatisticalProcessing = 0 ; + } #Precipitation type '260015' = { discipline = 0 ; diff --git a/definitions/grib2/localConcepts/uerra/shortName.def b/definitions/grib2/localConcepts/uerra/shortName.def index b16b48100..5a58eed8b 100644 --- a/definitions/grib2/localConcepts/uerra/shortName.def +++ b/definitions/grib2/localConcepts/uerra/shortName.def @@ -367,6 +367,15 @@ scaleFactorOfFirstFixedSurface = 0 ; typeOfStatisticalProcessing = 0 ; } +#Total column vertically-integrated graupel (snow pellets) +'tcolg' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 74 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + typeOfStatisticalProcessing = 0 ; + } #Precipitation type 'ptype' = { discipline = 0 ; diff --git a/definitions/grib2/localConcepts/uerra/units.def b/definitions/grib2/localConcepts/uerra/units.def index f86099f59..e7a5e35d0 100644 --- a/definitions/grib2/localConcepts/uerra/units.def +++ b/definitions/grib2/localConcepts/uerra/units.def @@ -367,6 +367,15 @@ scaleFactorOfFirstFixedSurface = 0 ; typeOfStatisticalProcessing = 0 ; } +#Total column vertically-integrated graupel (snow pellets) +'kg m**-2' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 74 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + typeOfStatisticalProcessing = 0 ; + } #Precipitation type '(Code table 4.201)' = { discipline = 0 ; diff --git a/definitions/grib2/name.def b/definitions/grib2/name.def index 182b8fe4e..501d48d81 100644 --- a/definitions/grib2/name.def +++ b/definitions/grib2/name.def @@ -5008,6 +5008,15 @@ scaleFactorOfSecondFixedSurface = 0 ; typeOfStatisticalProcessing = 0 ; } +#Time-mean total column vertically-integrated graupel (snow pellets) +'Time-mean total column vertically-integrated graupel (snow pellets)' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 74 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + typeOfStatisticalProcessing = 0 ; + } #Time-mean geopotential 'Time-mean geopotential' = { discipline = 0 ; @@ -5383,6 +5392,15 @@ scaleFactorOfFirstFixedSurface = missing() ; typeOfStatisticalProcessing = 3 ; } +#Time-minimum total column vertically-integrated graupel (snow pellets) +'Time-minimum total column vertically-integrated graupel (snow pellets)' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 74 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + typeOfStatisticalProcessing = 3 ; + } #Time-standard-deviation volumetric soil moisture 'Time-standard-deviation volumetric soil moisture' = { discipline = 2 ; @@ -5400,6 +5418,15 @@ scaleFactorOfFirstFixedSurface = missing() ; typeOfStatisticalProcessing = 6 ; } +#Time-standard-deviation total column vertically-integrated graupel (snow pellets) +'Time-standard-deviation total column vertically-integrated graupel (snow pellets)' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 74 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + typeOfStatisticalProcessing = 6 ; + } #Cross sectional area of flow in channel 'Cross sectional area of flow in channel' = { discipline = 1 ; @@ -5646,8 +5673,8 @@ gridDefinitionTemplateNumber = 101 ; numberOfGridInReference = 5 ; } -#Total column graupel -'Total column graupel' = { +#Total column vertically-integrated graupel (snow pellets) +'Total column vertically-integrated graupel (snow pellets)' = { discipline = 0 ; parameterCategory = 1 ; parameterNumber = 74 ; diff --git a/definitions/grib2/paramId.def b/definitions/grib2/paramId.def index 601455452..8a9350a1d 100644 --- a/definitions/grib2/paramId.def +++ b/definitions/grib2/paramId.def @@ -5008,6 +5008,15 @@ scaleFactorOfSecondFixedSurface = 0 ; typeOfStatisticalProcessing = 0 ; } +#Time-mean total column vertically-integrated graupel (snow pellets) +'235120' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 74 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + typeOfStatisticalProcessing = 0 ; + } #Time-mean geopotential '235129' = { discipline = 0 ; @@ -5383,6 +5392,15 @@ scaleFactorOfFirstFixedSurface = missing() ; typeOfStatisticalProcessing = 3 ; } +#Time-minimum total column vertically-integrated graupel (snow pellets) +'238120' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 74 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + typeOfStatisticalProcessing = 3 ; + } #Time-standard-deviation volumetric soil moisture '239077' = { discipline = 2 ; @@ -5400,6 +5418,15 @@ scaleFactorOfFirstFixedSurface = missing() ; typeOfStatisticalProcessing = 6 ; } +#Time-standard-deviation total column vertically-integrated graupel (snow pellets) +'239120' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 74 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + typeOfStatisticalProcessing = 6 ; + } #Cross sectional area of flow in channel '240011' = { discipline = 1 ; @@ -5646,7 +5673,7 @@ gridDefinitionTemplateNumber = 101 ; numberOfGridInReference = 5 ; } -#Total column graupel +#Total column vertically-integrated graupel (snow pellets) '260001' = { discipline = 0 ; parameterCategory = 1 ; diff --git a/definitions/grib2/shortName.def b/definitions/grib2/shortName.def index 1ae881b50..ff991e8c6 100644 --- a/definitions/grib2/shortName.def +++ b/definitions/grib2/shortName.def @@ -5008,6 +5008,15 @@ scaleFactorOfSecondFixedSurface = 0 ; typeOfStatisticalProcessing = 0 ; } +#Time-mean total column vertically-integrated graupel (snow pellets) +'avg_tcolg' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 74 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + typeOfStatisticalProcessing = 0 ; + } #Time-mean geopotential 'avg_z' = { discipline = 0 ; @@ -5383,6 +5392,15 @@ scaleFactorOfFirstFixedSurface = missing() ; typeOfStatisticalProcessing = 3 ; } +#Time-minimum total column vertically-integrated graupel (snow pellets) +'min_tcolg' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 74 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + typeOfStatisticalProcessing = 3 ; + } #Time-standard-deviation volumetric soil moisture 'std_vsw' = { discipline = 2 ; @@ -5400,6 +5418,15 @@ scaleFactorOfFirstFixedSurface = missing() ; typeOfStatisticalProcessing = 6 ; } +#Time-standard-deviation total column vertically-integrated graupel (snow pellets) +'std_tcolg' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 74 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + typeOfStatisticalProcessing = 6 ; + } #Cross sectional area of flow in channel 'chcross' = { discipline = 1 ; @@ -5646,7 +5673,7 @@ gridDefinitionTemplateNumber = 101 ; numberOfGridInReference = 5 ; } -#Total column graupel +#Total column vertically-integrated graupel (snow pellets) 'tcolg' = { discipline = 0 ; parameterCategory = 1 ; diff --git a/definitions/grib2/units.def b/definitions/grib2/units.def index a6cda2c83..19fd21f3e 100644 --- a/definitions/grib2/units.def +++ b/definitions/grib2/units.def @@ -5008,6 +5008,15 @@ scaleFactorOfSecondFixedSurface = 0 ; typeOfStatisticalProcessing = 0 ; } +#Time-mean total column vertically-integrated graupel (snow pellets) +'kg m**-2' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 74 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + typeOfStatisticalProcessing = 0 ; + } #Time-mean geopotential 'm**2 s**-2' = { discipline = 0 ; @@ -5383,6 +5392,15 @@ scaleFactorOfFirstFixedSurface = missing() ; typeOfStatisticalProcessing = 3 ; } +#Time-minimum total column vertically-integrated graupel (snow pellets) +'kg m**-2' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 74 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + typeOfStatisticalProcessing = 3 ; + } #Time-standard-deviation volumetric soil moisture 'm**3 m**-3' = { discipline = 2 ; @@ -5400,6 +5418,15 @@ scaleFactorOfFirstFixedSurface = missing() ; typeOfStatisticalProcessing = 6 ; } +#Time-standard-deviation total column vertically-integrated graupel (snow pellets) +'kg m**-2' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 74 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + typeOfStatisticalProcessing = 6 ; + } #Cross sectional area of flow in channel 'm**2' = { discipline = 1 ; @@ -5646,7 +5673,7 @@ gridDefinitionTemplateNumber = 101 ; numberOfGridInReference = 5 ; } -#Total column graupel +#Total column vertically-integrated graupel (snow pellets) 'kg m**-2' = { discipline = 0 ; parameterCategory = 1 ; From 9b203f1184c7a939eee80846c822f1ec149b25da Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Mon, 12 Aug 2024 11:12:46 +0000 Subject: [PATCH 04/27] Change assertion into proper error --- .../grib_accessor_class_data_complex_packing.cc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/accessor/grib_accessor_class_data_complex_packing.cc b/src/accessor/grib_accessor_class_data_complex_packing.cc index 81e402303..d3cf71a34 100644 --- a/src/accessor/grib_accessor_class_data_complex_packing.cc +++ b/src/accessor/grib_accessor_class_data_complex_packing.cc @@ -752,8 +752,15 @@ static int unpack_real(grib_accessor* a, T* val, size_t* len) mmax++; } - Assert(*len >= i); - *len = i; + //Assert(*len >= i); + if (*len < i) { + grib_context_log(a->context, GRIB_LOG_ERROR, "%s::%s: Invalid values *len=%zu and i=%zu.", + cclass_name, __func__, *len, i); + grib_context_log(a->context, GRIB_LOG_ERROR, "Make sure your array is large enough."); + ret = GRIB_ARRAY_TOO_SMALL; + } else { + *len = i; + } grib_context_free(a->context, scals); From 76e625675e28f965ffae90acbd502c8294e57135 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Mon, 12 Aug 2024 12:20:11 +0000 Subject: [PATCH 05/27] ECC-1882: cfVarNames fixed --- definitions/grib2/cfVarName.def | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/definitions/grib2/cfVarName.def b/definitions/grib2/cfVarName.def index 892a27e9b..9b7627d2b 100644 --- a/definitions/grib2/cfVarName.def +++ b/definitions/grib2/cfVarName.def @@ -187,7 +187,7 @@ scaleFactorOfFirstFixedSurface = 0 ; } #Time-maximum 2 metre relative humidity -'mx2r' = { +'max_2r' = { discipline = 0 ; parameterCategory = 1 ; parameterNumber = 1 ; @@ -197,7 +197,7 @@ typeOfStatisticalProcessing = 2 ; } #Time-minimum 2 metre relative humidity -'mn2r' = { +'min_2r' = { discipline = 0 ; parameterCategory = 1 ; parameterNumber = 1 ; From de8e34b00a799ae5acbf30ed80156806dff19505 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Mon, 12 Aug 2024 15:04:15 +0000 Subject: [PATCH 06/27] ECC-1880: GRIB2: Additions & modifications of instantaneous parameters for generalised time processing approach (part 1) --- .../localConcepts/ecmf/cfVarName.legacy.def | 42 +++ .../grib2/localConcepts/ecmf/name.legacy.def | 42 +++ .../localConcepts/ecmf/paramId.legacy.def | 42 +++ .../localConcepts/ecmf/shortName.legacy.def | 42 +++ .../grib2/localConcepts/ecmf/units.legacy.def | 42 +++ definitions/grib2/name.def | 348 ++++++++++++++++++ definitions/grib2/paramId.def | 348 ++++++++++++++++++ definitions/grib2/shortName.def | 348 ++++++++++++++++++ definitions/grib2/units.def | 348 ++++++++++++++++++ 9 files changed, 1602 insertions(+) create mode 100644 definitions/grib2/localConcepts/ecmf/cfVarName.legacy.def diff --git a/definitions/grib2/localConcepts/ecmf/cfVarName.legacy.def b/definitions/grib2/localConcepts/ecmf/cfVarName.legacy.def new file mode 100644 index 000000000..5f471d93c --- /dev/null +++ b/definitions/grib2/localConcepts/ecmf/cfVarName.legacy.def @@ -0,0 +1,42 @@ +#Magnitude of turbulent surface stress +'p48.172' = { + discipline = 192 ; + parameterCategory = 172 ; + parameterNumber = 48 ; +} +#Mean large-scale precipitation fraction +'mlspfr' = { + discipline = 192 ; + parameterCategory = 172 ; + parameterNumber = 50 ; +} +#Boundary layer dissipation +'bldrate' = { + discipline = 192 ; + parameterCategory = 172 ; + parameterNumber = 145 ; +} +#Mean sunshine duration rate +'msdr' = { + discipline = 192 ; + parameterCategory = 172 ; + parameterNumber = 189 ; +} +#Longitudinal component of gravity wave stress +'p195.172' = { + discipline = 192 ; + parameterCategory = 172 ; + parameterNumber = 195 ; +} +#Meridional component of gravity wave stress +'p196.172' = { + discipline = 192 ; + parameterCategory = 172 ; + parameterNumber = 196 ; +} +#Gravity wave dissipation +'gwdrate' = { + discipline = 192 ; + parameterCategory = 172 ; + parameterNumber = 197 ; +} diff --git a/definitions/grib2/localConcepts/ecmf/name.legacy.def b/definitions/grib2/localConcepts/ecmf/name.legacy.def index 28b2586ef..7d8d36d0f 100644 --- a/definitions/grib2/localConcepts/ecmf/name.legacy.def +++ b/definitions/grib2/localConcepts/ecmf/name.legacy.def @@ -1777,3 +1777,45 @@ parameterCategory = 140 ; parameterNumber = 254 ; } +#Magnitude of turbulent surface stress +'Magnitude of turbulent surface stress' = { + discipline = 192 ; + parameterCategory = 172 ; + parameterNumber = 48 ; +} +#Mean large-scale precipitation fraction +'Mean large-scale precipitation fraction' = { + discipline = 192 ; + parameterCategory = 172 ; + parameterNumber = 50 ; +} +#Boundary layer dissipation +'Boundary layer dissipation' = { + discipline = 192 ; + parameterCategory = 172 ; + parameterNumber = 145 ; +} +#Mean sunshine duration rate +'Mean sunshine duration rate' = { + discipline = 192 ; + parameterCategory = 172 ; + parameterNumber = 189 ; +} +#Longitudinal component of gravity wave stress +'Longitudinal component of gravity wave stress' = { + discipline = 192 ; + parameterCategory = 172 ; + parameterNumber = 195 ; +} +#Meridional component of gravity wave stress +'Meridional component of gravity wave stress' = { + discipline = 192 ; + parameterCategory = 172 ; + parameterNumber = 196 ; +} +#Gravity wave dissipation +'Gravity wave dissipation' = { + discipline = 192 ; + parameterCategory = 172 ; + parameterNumber = 197 ; +} diff --git a/definitions/grib2/localConcepts/ecmf/paramId.legacy.def b/definitions/grib2/localConcepts/ecmf/paramId.legacy.def index df813254f..4d746c798 100644 --- a/definitions/grib2/localConcepts/ecmf/paramId.legacy.def +++ b/definitions/grib2/localConcepts/ecmf/paramId.legacy.def @@ -1777,3 +1777,45 @@ parameterCategory = 140 ; parameterNumber = 254 ; } +#Magnitude of turbulent surface stress +'172048' = { + discipline = 192 ; + parameterCategory = 172 ; + parameterNumber = 48 ; +} +#Mean large-scale precipitation fraction +'172050' = { + discipline = 192 ; + parameterCategory = 172 ; + parameterNumber = 50 ; +} +#Boundary layer dissipation +'172145' = { + discipline = 192 ; + parameterCategory = 172 ; + parameterNumber = 145 ; +} +#Mean sunshine duration rate +'172189' = { + discipline = 192 ; + parameterCategory = 172 ; + parameterNumber = 189 ; +} +#Longitudinal component of gravity wave stress +'172195' = { + discipline = 192 ; + parameterCategory = 172 ; + parameterNumber = 195 ; +} +#Meridional component of gravity wave stress +'172196' = { + discipline = 192 ; + parameterCategory = 172 ; + parameterNumber = 196 ; +} +#Gravity wave dissipation +'172197' = { + discipline = 192 ; + parameterCategory = 172 ; + parameterNumber = 197 ; +} diff --git a/definitions/grib2/localConcepts/ecmf/shortName.legacy.def b/definitions/grib2/localConcepts/ecmf/shortName.legacy.def index 498f6a3c1..c954c06c9 100644 --- a/definitions/grib2/localConcepts/ecmf/shortName.legacy.def +++ b/definitions/grib2/localConcepts/ecmf/shortName.legacy.def @@ -1777,3 +1777,45 @@ parameterCategory = 140 ; parameterNumber = 254 ; } +#Magnitude of turbulent surface stress +'~' = { + discipline = 192 ; + parameterCategory = 172 ; + parameterNumber = 48 ; +} +#Mean large-scale precipitation fraction +'mlspfr' = { + discipline = 192 ; + parameterCategory = 172 ; + parameterNumber = 50 ; +} +#Boundary layer dissipation +'bldrate' = { + discipline = 192 ; + parameterCategory = 172 ; + parameterNumber = 145 ; +} +#Mean sunshine duration rate +'msdr' = { + discipline = 192 ; + parameterCategory = 172 ; + parameterNumber = 189 ; +} +#Longitudinal component of gravity wave stress +'~' = { + discipline = 192 ; + parameterCategory = 172 ; + parameterNumber = 195 ; +} +#Meridional component of gravity wave stress +'~' = { + discipline = 192 ; + parameterCategory = 172 ; + parameterNumber = 196 ; +} +#Gravity wave dissipation +'gwdrate' = { + discipline = 192 ; + parameterCategory = 172 ; + parameterNumber = 197 ; +} diff --git a/definitions/grib2/localConcepts/ecmf/units.legacy.def b/definitions/grib2/localConcepts/ecmf/units.legacy.def index d7675c4d6..953b96cc0 100644 --- a/definitions/grib2/localConcepts/ecmf/units.legacy.def +++ b/definitions/grib2/localConcepts/ecmf/units.legacy.def @@ -1777,3 +1777,45 @@ parameterCategory = 140 ; parameterNumber = 254 ; } +#Magnitude of turbulent surface stress +'N m**-2' = { + discipline = 192 ; + parameterCategory = 172 ; + parameterNumber = 48 ; +} +#Mean large-scale precipitation fraction +'~' = { + discipline = 192 ; + parameterCategory = 172 ; + parameterNumber = 50 ; +} +#Boundary layer dissipation +'W m**-2' = { + discipline = 192 ; + parameterCategory = 172 ; + parameterNumber = 145 ; +} +#Mean sunshine duration rate +'s s**-1' = { + discipline = 192 ; + parameterCategory = 172 ; + parameterNumber = 189 ; +} +#Longitudinal component of gravity wave stress +'N m**-2' = { + discipline = 192 ; + parameterCategory = 172 ; + parameterNumber = 195 ; +} +#Meridional component of gravity wave stress +'N m**-2' = { + discipline = 192 ; + parameterCategory = 172 ; + parameterNumber = 196 ; +} +#Gravity wave dissipation +'W m**-2' = { + discipline = 192 ; + parameterCategory = 172 ; + parameterNumber = 197 ; +} diff --git a/definitions/grib2/name.def b/definitions/grib2/name.def index 501d48d81..c5b34813d 100644 --- a/definitions/grib2/name.def +++ b/definitions/grib2/name.def @@ -1345,6 +1345,159 @@ scaledValueOfSecondFixedSurface = 300 ; scaleFactorOfSecondFixedSurface = 0 ; } +#Total column vertically-integrated divergence of water geopotential flux +'Total column vertically-integrated divergence of water geopotential flux' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 42 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated eastward enthalpy flux +'Total column vertically-integrated eastward enthalpy flux' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 5 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated northward enthalpy flux +'Total column vertically-integrated northward enthalpy flux' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 6 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated divergence of enthalpy flux +'Total column vertically-integrated divergence of enthalpy flux' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 13 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated divergence of water enthalpy flux +'Total column vertically-integrated divergence of water enthalpy flux' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 18 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated divergence of water vapour flux +'Total column vertically-integrated divergence of water vapour flux' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 160 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated divergence of cloud liquid water flux +'Total column vertically-integrated divergence of cloud liquid water flux' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 161 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated divergence of cloud ice water flux +'Total column vertically-integrated divergence of cloud ice water flux' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 162 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated divergence of rain flux +'Total column vertically-integrated divergence of rain flux' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 163 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated divergence of snow flux +'Total column vertically-integrated divergence of snow flux' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 164 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated eastward cloud liquid water flux +'Total column vertically-integrated eastward cloud liquid water flux' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 152 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated northward cloud liquid water flux +'Total column vertically-integrated northward cloud liquid water flux' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 153 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated eastward cloud ice water flux +'Total column vertically-integrated eastward cloud ice water flux' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 154 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated northward cloud ice water flux +'Total column vertically-integrated northward cloud ice water flux' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 155 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated eastward rain flux +'Total column vertically-integrated eastward rain flux' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 156 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated northward rain flux +'Total column vertically-integrated northward rain flux' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 157 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated eastward snow flux +'Total column vertically-integrated eastward snow flux' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 158 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated northward snow flux +'Total column vertically-integrated northward snow flux' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 159 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated net source of ozone +'Total column vertically-integrated net source of ozone' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 81 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + constituentType = 0 ; + } #Total column vertically-integrated water enthalpy 'Total column vertically-integrated water enthalpy' = { discipline = 0 ; @@ -1353,6 +1506,90 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } +#Temperature tendency due to short-wave radiation +'Temperature tendency due to short-wave radiation' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 22 ; + } +#Temperature tendency due to long-wave radiation +'Temperature tendency due to long-wave radiation' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 23 ; + } +#Temperature tendency due to short-wave radiation, clear sky +'Temperature tendency due to short-wave radiation, clear sky' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 24 ; + } +#Temperature tendency due to long-wave radiation, clear sky +'Temperature tendency due to long-wave radiation, clear sky' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 25 ; + } +#Updraught mass flux +'Updraught mass flux' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 27 ; + } +#Downdraught mass flux +'Downdraught mass flux' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 28 ; + } +#Updraught detrainment rate +'Updraught detrainment rate' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 29 ; + } +#Downdraught detrainment rate +'Downdraught detrainment rate' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 30 ; + } +#Total precipitation flux +'Total precipitation flux' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 52 ; + } +#Turbulent diffusion coefficient for heat +'Turbulent diffusion coefficient for heat' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 20 ; + } +#Temperature tendency due to parametrisations +'Temperature tendency due to parametrisations' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 26 ; + } +#Specific humidity tendency due to parametrisations +'Specific humidity tendency due to parametrisations' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 108 ; + } +#Eastward wind tendency due to parametrisations +'Eastward wind tendency due to parametrisations' = { + discipline = 0 ; + parameterCategory = 2 ; + parameterNumber = 39 ; + } +#Northward wind tendency due to parametrisations +'Northward wind tendency due to parametrisations' = { + discipline = 0 ; + parameterCategory = 2 ; + parameterNumber = 40 ; + } #2 metre specific humidity '2 metre specific humidity' = { discipline = 0 ; @@ -3835,6 +4072,13 @@ parameterNumber = 48 ; typeOfFirstFixedSurface = 1 ; } +#Snow evaporation rate water equivalent +'Snow evaporation rate water equivalent' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 148 ; + typeOfFirstFixedSurface = 1 ; + } #Burned area 'Burned area' = { discipline = 2 ; @@ -7604,6 +7848,110 @@ scaledValueOfSecondFixedSurface = 1 ; scaleFactorOfSecondFixedSurface = 0 ; } +#Surface photosynthetically active radiation flux, clear sky +'Surface photosynthetically active radiation flux, clear sky' = { + discipline = 0 ; + parameterCategory = 4 ; + parameterNumber = 60 ; + typeOfFirstFixedSurface = 1 ; + } +#Surface direct normal short-wave radiation flux +'Surface direct normal short-wave radiation flux' = { + discipline = 0 ; + parameterCategory = 4 ; + parameterNumber = 54 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 255 ; + } +#Instantaneous magnitude of turbulent surface stress +'Instantaneous magnitude of turbulent surface stress' = { + discipline = 0 ; + parameterCategory = 2 ; + parameterNumber = 58 ; + typeOfFirstFixedSurface = 1 ; + } +#Instantaneous boundary layer dissipation +'Instantaneous boundary layer dissipation' = { + discipline = 0 ; + parameterCategory = 2 ; + parameterNumber = 20 ; + } +#Top net short-wave radiation flux +'Top net short-wave radiation flux' = { + discipline = 0 ; + parameterCategory = 4 ; + parameterNumber = 9 ; + typeOfFirstFixedSurface = 8 ; + } +#Top net long-wave radiation flux +'Top net long-wave radiation flux' = { + discipline = 0 ; + parameterCategory = 5 ; + parameterNumber = 5 ; + typeOfFirstFixedSurface = 8 ; + } +#Instantaneous gravity wave dissipation +'Instantaneous gravity wave dissipation' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 23 ; + } +#Top net short-wave radiation flux, clear sky +'Top net short-wave radiation flux, clear sky' = { + discipline = 0 ; + parameterCategory = 4 ; + parameterNumber = 11 ; + typeOfFirstFixedSurface = 8 ; + } +#Top net long-wave radiation flux, clear sky +'Top net long-wave radiation flux, clear sky' = { + discipline = 0 ; + parameterCategory = 5 ; + parameterNumber = 6 ; + typeOfFirstFixedSurface = 8 ; + } +#Top downward short-wave radiation flux +'Top downward short-wave radiation flux' = { + discipline = 0 ; + parameterCategory = 4 ; + parameterNumber = 7 ; + typeOfFirstFixedSurface = 8 ; + } +#Surface direct short-wave radiation flux, clear sky +'Surface direct short-wave radiation flux, clear sky' = { + discipline = 0 ; + parameterCategory = 4 ; + parameterNumber = 61 ; + typeOfFirstFixedSurface = 1 ; + } +#Instantaneous eastward turbulent surface stress due to orographic form drag +'Instantaneous eastward turbulent surface stress due to orographic form drag' = { + discipline = 0 ; + parameterCategory = 2 ; + parameterNumber = 64 ; + typeOfFirstFixedSurface = 1 ; + } +#Instantaneous northward turbulent surface stress due to orographic form drag +'Instantaneous northward turbulent surface stress due to orographic form drag' = { + discipline = 0 ; + parameterCategory = 2 ; + parameterNumber = 65 ; + typeOfFirstFixedSurface = 1 ; + } +#Instantaneous eastward turbulent surface stress due to surface roughness +'Instantaneous eastward turbulent surface stress due to surface roughness' = { + discipline = 0 ; + parameterCategory = 2 ; + parameterNumber = 66 ; + typeOfFirstFixedSurface = 1 ; + } +#Instantaneous northward turbulent surface stress due to surface roughness +'Instantaneous northward turbulent surface stress due to surface roughness' = { + discipline = 0 ; + parameterCategory = 2 ; + parameterNumber = 67 ; + typeOfFirstFixedSurface = 1 ; + } #Universal thermal climate index 'Universal thermal climate index' = { discipline = 20 ; diff --git a/definitions/grib2/paramId.def b/definitions/grib2/paramId.def index 8a9350a1d..5f20eaa1a 100644 --- a/definitions/grib2/paramId.def +++ b/definitions/grib2/paramId.def @@ -1345,6 +1345,159 @@ scaledValueOfSecondFixedSurface = 300 ; scaleFactorOfSecondFixedSurface = 0 ; } +#Total column vertically-integrated divergence of water geopotential flux +'162031' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 42 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated eastward enthalpy flux +'162032' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 5 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated northward enthalpy flux +'162033' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 6 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated divergence of enthalpy flux +'162034' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 13 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated divergence of water enthalpy flux +'162035' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 18 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated divergence of water vapour flux +'162036' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 160 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated divergence of cloud liquid water flux +'162037' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 161 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated divergence of cloud ice water flux +'162038' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 162 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated divergence of rain flux +'162039' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 163 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated divergence of snow flux +'162040' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 164 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated eastward cloud liquid water flux +'162041' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 152 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated northward cloud liquid water flux +'162042' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 153 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated eastward cloud ice water flux +'162043' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 154 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated northward cloud ice water flux +'162044' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 155 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated eastward rain flux +'162046' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 156 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated northward rain flux +'162047' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 157 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated eastward snow flux +'162048' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 158 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated northward snow flux +'162049' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 159 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated net source of ozone +'162050' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 81 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + constituentType = 0 ; + } #Total column vertically-integrated water enthalpy '162093' = { discipline = 0 ; @@ -1353,6 +1506,90 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } +#Temperature tendency due to short-wave radiation +'162150' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 22 ; + } +#Temperature tendency due to long-wave radiation +'162151' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 23 ; + } +#Temperature tendency due to short-wave radiation, clear sky +'162152' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 24 ; + } +#Temperature tendency due to long-wave radiation, clear sky +'162153' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 25 ; + } +#Updraught mass flux +'162154' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 27 ; + } +#Downdraught mass flux +'162155' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 28 ; + } +#Updraught detrainment rate +'162156' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 29 ; + } +#Downdraught detrainment rate +'162157' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 30 ; + } +#Total precipitation flux +'162158' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 52 ; + } +#Turbulent diffusion coefficient for heat +'162159' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 20 ; + } +#Temperature tendency due to parametrisations +'162160' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 26 ; + } +#Specific humidity tendency due to parametrisations +'162161' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 108 ; + } +#Eastward wind tendency due to parametrisations +'162162' = { + discipline = 0 ; + parameterCategory = 2 ; + parameterNumber = 39 ; + } +#Northward wind tendency due to parametrisations +'162163' = { + discipline = 0 ; + parameterCategory = 2 ; + parameterNumber = 40 ; + } #2 metre specific humidity '174096' = { discipline = 0 ; @@ -3835,6 +4072,13 @@ parameterNumber = 48 ; typeOfFirstFixedSurface = 1 ; } +#Snow evaporation rate water equivalent +'231065' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 148 ; + typeOfFirstFixedSurface = 1 ; + } #Burned area '232000' = { discipline = 2 ; @@ -7604,6 +7848,110 @@ scaledValueOfSecondFixedSurface = 1 ; scaleFactorOfSecondFixedSurface = 0 ; } +#Surface photosynthetically active radiation flux, clear sky +'260667' = { + discipline = 0 ; + parameterCategory = 4 ; + parameterNumber = 60 ; + typeOfFirstFixedSurface = 1 ; + } +#Surface direct normal short-wave radiation flux +'260668' = { + discipline = 0 ; + parameterCategory = 4 ; + parameterNumber = 54 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 255 ; + } +#Instantaneous magnitude of turbulent surface stress +'260669' = { + discipline = 0 ; + parameterCategory = 2 ; + parameterNumber = 58 ; + typeOfFirstFixedSurface = 1 ; + } +#Instantaneous boundary layer dissipation +'260670' = { + discipline = 0 ; + parameterCategory = 2 ; + parameterNumber = 20 ; + } +#Top net short-wave radiation flux +'260671' = { + discipline = 0 ; + parameterCategory = 4 ; + parameterNumber = 9 ; + typeOfFirstFixedSurface = 8 ; + } +#Top net long-wave radiation flux +'260672' = { + discipline = 0 ; + parameterCategory = 5 ; + parameterNumber = 5 ; + typeOfFirstFixedSurface = 8 ; + } +#Instantaneous gravity wave dissipation +'260673' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 23 ; + } +#Top net short-wave radiation flux, clear sky +'260674' = { + discipline = 0 ; + parameterCategory = 4 ; + parameterNumber = 11 ; + typeOfFirstFixedSurface = 8 ; + } +#Top net long-wave radiation flux, clear sky +'260675' = { + discipline = 0 ; + parameterCategory = 5 ; + parameterNumber = 6 ; + typeOfFirstFixedSurface = 8 ; + } +#Top downward short-wave radiation flux +'260676' = { + discipline = 0 ; + parameterCategory = 4 ; + parameterNumber = 7 ; + typeOfFirstFixedSurface = 8 ; + } +#Surface direct short-wave radiation flux, clear sky +'260677' = { + discipline = 0 ; + parameterCategory = 4 ; + parameterNumber = 61 ; + typeOfFirstFixedSurface = 1 ; + } +#Instantaneous eastward turbulent surface stress due to orographic form drag +'260678' = { + discipline = 0 ; + parameterCategory = 2 ; + parameterNumber = 64 ; + typeOfFirstFixedSurface = 1 ; + } +#Instantaneous northward turbulent surface stress due to orographic form drag +'260679' = { + discipline = 0 ; + parameterCategory = 2 ; + parameterNumber = 65 ; + typeOfFirstFixedSurface = 1 ; + } +#Instantaneous eastward turbulent surface stress due to surface roughness +'260680' = { + discipline = 0 ; + parameterCategory = 2 ; + parameterNumber = 66 ; + typeOfFirstFixedSurface = 1 ; + } +#Instantaneous northward turbulent surface stress due to surface roughness +'260681' = { + discipline = 0 ; + parameterCategory = 2 ; + parameterNumber = 67 ; + typeOfFirstFixedSurface = 1 ; + } #Universal thermal climate index '261001' = { discipline = 20 ; diff --git a/definitions/grib2/shortName.def b/definitions/grib2/shortName.def index ff991e8c6..7364f5e19 100644 --- a/definitions/grib2/shortName.def +++ b/definitions/grib2/shortName.def @@ -1345,6 +1345,159 @@ scaledValueOfSecondFixedSurface = 300 ; scaleFactorOfSecondFixedSurface = 0 ; } +#Total column vertically-integrated divergence of water geopotential flux +'viwgd' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 42 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated eastward enthalpy flux +'viee' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 5 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated northward enthalpy flux +'vien' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 6 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated divergence of enthalpy flux +'vied' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 13 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated divergence of water enthalpy flux +'viwed' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 18 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated divergence of water vapour flux +'viwvd' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 160 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated divergence of cloud liquid water flux +'viclwd' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 161 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated divergence of cloud ice water flux +'viciwd' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 162 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated divergence of rain flux +'vird' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 163 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated divergence of snow flux +'visd' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 164 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated eastward cloud liquid water flux +'viclwe' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 152 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated northward cloud liquid water flux +'viclwn' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 153 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated eastward cloud ice water flux +'viciwe' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 154 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated northward cloud ice water flux +'viciwn' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 155 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated eastward rain flux +'vire' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 156 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated northward rain flux +'virn' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 157 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated eastward snow flux +'vise' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 158 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated northward snow flux +'visn' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 159 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated net source of ozone +'vions' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 81 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + constituentType = 0 ; + } #Total column vertically-integrated water enthalpy 'viwe' = { discipline = 0 ; @@ -1353,6 +1506,90 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } +#Temperature tendency due to short-wave radiation +'ttswr' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 22 ; + } +#Temperature tendency due to long-wave radiation +'ttlwr' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 23 ; + } +#Temperature tendency due to short-wave radiation, clear sky +'ttswrcs' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 24 ; + } +#Temperature tendency due to long-wave radiation, clear sky +'ttlwrcs' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 25 ; + } +#Updraught mass flux +'umf' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 27 ; + } +#Downdraught mass flux +'dmf' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 28 ; + } +#Updraught detrainment rate +'udr' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 29 ; + } +#Downdraught detrainment rate +'ddr' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 30 ; + } +#Total precipitation flux +'tpf' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 52 ; + } +#Turbulent diffusion coefficient for heat +'tdch' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 20 ; + } +#Temperature tendency due to parametrisations +'ttpm' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 26 ; + } +#Specific humidity tendency due to parametrisations +'qtpm' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 108 ; + } +#Eastward wind tendency due to parametrisations +'utpm' = { + discipline = 0 ; + parameterCategory = 2 ; + parameterNumber = 39 ; + } +#Northward wind tendency due to parametrisations +'vtpm' = { + discipline = 0 ; + parameterCategory = 2 ; + parameterNumber = 40 ; + } #2 metre specific humidity '2sh' = { discipline = 0 ; @@ -3835,6 +4072,13 @@ parameterNumber = 48 ; typeOfFirstFixedSurface = 1 ; } +#Snow evaporation rate water equivalent +'esrwe' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 148 ; + typeOfFirstFixedSurface = 1 ; + } #Burned area 'fba' = { discipline = 2 ; @@ -7604,6 +7848,110 @@ scaledValueOfSecondFixedSurface = 1 ; scaleFactorOfSecondFixedSurface = 0 ; } +#Surface photosynthetically active radiation flux, clear sky +'parcsf' = { + discipline = 0 ; + parameterCategory = 4 ; + parameterNumber = 60 ; + typeOfFirstFixedSurface = 1 ; + } +#Surface direct normal short-wave radiation flux +'sdirnswrf' = { + discipline = 0 ; + parameterCategory = 4 ; + parameterNumber = 54 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 255 ; + } +#Instantaneous magnitude of turbulent surface stress +'imagss' = { + discipline = 0 ; + parameterCategory = 2 ; + parameterNumber = 58 ; + typeOfFirstFixedSurface = 1 ; + } +#Instantaneous boundary layer dissipation +'ibld' = { + discipline = 0 ; + parameterCategory = 2 ; + parameterNumber = 20 ; + } +#Top net short-wave radiation flux +'tnswrf' = { + discipline = 0 ; + parameterCategory = 4 ; + parameterNumber = 9 ; + typeOfFirstFixedSurface = 8 ; + } +#Top net long-wave radiation flux +'tnlwrf' = { + discipline = 0 ; + parameterCategory = 5 ; + parameterNumber = 5 ; + typeOfFirstFixedSurface = 8 ; + } +#Instantaneous gravity wave dissipation +'igwd' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 23 ; + } +#Top net short-wave radiation flux, clear sky +'tnswrfcs' = { + discipline = 0 ; + parameterCategory = 4 ; + parameterNumber = 11 ; + typeOfFirstFixedSurface = 8 ; + } +#Top net long-wave radiation flux, clear sky +'tnlwrcs' = { + discipline = 0 ; + parameterCategory = 5 ; + parameterNumber = 6 ; + typeOfFirstFixedSurface = 8 ; + } +#Top downward short-wave radiation flux +'tdswrf' = { + discipline = 0 ; + parameterCategory = 4 ; + parameterNumber = 7 ; + typeOfFirstFixedSurface = 8 ; + } +#Surface direct short-wave radiation flux, clear sky +'sdirswrfcs' = { + discipline = 0 ; + parameterCategory = 4 ; + parameterNumber = 61 ; + typeOfFirstFixedSurface = 1 ; + } +#Instantaneous eastward turbulent surface stress due to orographic form drag +'ietssofd' = { + discipline = 0 ; + parameterCategory = 2 ; + parameterNumber = 64 ; + typeOfFirstFixedSurface = 1 ; + } +#Instantaneous northward turbulent surface stress due to orographic form drag +'intssofd' = { + discipline = 0 ; + parameterCategory = 2 ; + parameterNumber = 65 ; + typeOfFirstFixedSurface = 1 ; + } +#Instantaneous eastward turbulent surface stress due to surface roughness +'ietsssr' = { + discipline = 0 ; + parameterCategory = 2 ; + parameterNumber = 66 ; + typeOfFirstFixedSurface = 1 ; + } +#Instantaneous northward turbulent surface stress due to surface roughness +'intsssr' = { + discipline = 0 ; + parameterCategory = 2 ; + parameterNumber = 67 ; + typeOfFirstFixedSurface = 1 ; + } #Universal thermal climate index 'utci' = { discipline = 20 ; diff --git a/definitions/grib2/units.def b/definitions/grib2/units.def index 19fd21f3e..48f69386d 100644 --- a/definitions/grib2/units.def +++ b/definitions/grib2/units.def @@ -1345,6 +1345,159 @@ scaledValueOfSecondFixedSurface = 300 ; scaleFactorOfSecondFixedSurface = 0 ; } +#Total column vertically-integrated divergence of water geopotential flux +'W m**-2' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 42 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated eastward enthalpy flux +'W m**-1' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 5 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated northward enthalpy flux +'W m**-1' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 6 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated divergence of enthalpy flux +'W m**-2' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 13 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated divergence of water enthalpy flux +'W m**-2' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 18 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated divergence of water vapour flux +'kg m**-2 s**-1' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 160 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated divergence of cloud liquid water flux +'kg m**-2 s**-1' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 161 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated divergence of cloud ice water flux +'kg m**-2 s**-1' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 162 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated divergence of rain flux +'kg m**-2 s**-1' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 163 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated divergence of snow flux +'kg m**-2 s**-1' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 164 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated eastward cloud liquid water flux +'kg m**-1 s**-1' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 152 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated northward cloud liquid water flux +'kg m**-1 s**-1' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 153 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated eastward cloud ice water flux +'kg m**-1 s**-1' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 154 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated northward cloud ice water flux +'kg m**-1 s**-1' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 155 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated eastward rain flux +'kg m**-1 s**-1' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 156 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated northward rain flux +'kg m**-1 s**-1' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 157 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated eastward snow flux +'kg m**-1 s**-1' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 158 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated northward snow flux +'kg m**-1 s**-1' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 159 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Total column vertically-integrated net source of ozone +'kg m**-2 s**-1' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 81 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + constituentType = 0 ; + } #Total column vertically-integrated water enthalpy 'J m**-2' = { discipline = 0 ; @@ -1353,6 +1506,90 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } +#Temperature tendency due to short-wave radiation +'K s**-1' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 22 ; + } +#Temperature tendency due to long-wave radiation +'K s**-1' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 23 ; + } +#Temperature tendency due to short-wave radiation, clear sky +'K s**-1' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 24 ; + } +#Temperature tendency due to long-wave radiation, clear sky +'K s**-1' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 25 ; + } +#Updraught mass flux +'kg m**-2 s**-1' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 27 ; + } +#Downdraught mass flux +'kg m**-2 s**-1' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 28 ; + } +#Updraught detrainment rate +'kg m**-3 s**-1' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 29 ; + } +#Downdraught detrainment rate +'kg m**-3 s**-1' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 30 ; + } +#Total precipitation flux +'kg m**-2 s**-1' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 52 ; + } +#Turbulent diffusion coefficient for heat +'m**2 s**-1' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 20 ; + } +#Temperature tendency due to parametrisations +'K s**-1' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 26 ; + } +#Specific humidity tendency due to parametrisations +'kg kg**-1 s**-1' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 108 ; + } +#Eastward wind tendency due to parametrisations +'m s**-2' = { + discipline = 0 ; + parameterCategory = 2 ; + parameterNumber = 39 ; + } +#Northward wind tendency due to parametrisations +'m s**-2' = { + discipline = 0 ; + parameterCategory = 2 ; + parameterNumber = 40 ; + } #2 metre specific humidity 'kg kg**-1' = { discipline = 0 ; @@ -3835,6 +4072,13 @@ parameterNumber = 48 ; typeOfFirstFixedSurface = 1 ; } +#Snow evaporation rate water equivalent +'kg m**-2 s**-1' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 148 ; + typeOfFirstFixedSurface = 1 ; + } #Burned area '%' = { discipline = 2 ; @@ -7604,6 +7848,110 @@ scaledValueOfSecondFixedSurface = 1 ; scaleFactorOfSecondFixedSurface = 0 ; } +#Surface photosynthetically active radiation flux, clear sky +'W m**-2' = { + discipline = 0 ; + parameterCategory = 4 ; + parameterNumber = 60 ; + typeOfFirstFixedSurface = 1 ; + } +#Surface direct normal short-wave radiation flux +'W m**-2' = { + discipline = 0 ; + parameterCategory = 4 ; + parameterNumber = 54 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 255 ; + } +#Instantaneous magnitude of turbulent surface stress +'N m**-2' = { + discipline = 0 ; + parameterCategory = 2 ; + parameterNumber = 58 ; + typeOfFirstFixedSurface = 1 ; + } +#Instantaneous boundary layer dissipation +'W m**-2' = { + discipline = 0 ; + parameterCategory = 2 ; + parameterNumber = 20 ; + } +#Top net short-wave radiation flux +'W m**-2' = { + discipline = 0 ; + parameterCategory = 4 ; + parameterNumber = 9 ; + typeOfFirstFixedSurface = 8 ; + } +#Top net long-wave radiation flux +'W m**-2' = { + discipline = 0 ; + parameterCategory = 5 ; + parameterNumber = 5 ; + typeOfFirstFixedSurface = 8 ; + } +#Instantaneous gravity wave dissipation +'W m**-2' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 23 ; + } +#Top net short-wave radiation flux, clear sky +'W m**-2' = { + discipline = 0 ; + parameterCategory = 4 ; + parameterNumber = 11 ; + typeOfFirstFixedSurface = 8 ; + } +#Top net long-wave radiation flux, clear sky +'W m**-2' = { + discipline = 0 ; + parameterCategory = 5 ; + parameterNumber = 6 ; + typeOfFirstFixedSurface = 8 ; + } +#Top downward short-wave radiation flux +'W m**-2' = { + discipline = 0 ; + parameterCategory = 4 ; + parameterNumber = 7 ; + typeOfFirstFixedSurface = 8 ; + } +#Surface direct short-wave radiation flux, clear sky +'W m**-2' = { + discipline = 0 ; + parameterCategory = 4 ; + parameterNumber = 61 ; + typeOfFirstFixedSurface = 1 ; + } +#Instantaneous eastward turbulent surface stress due to orographic form drag +'N m**-2' = { + discipline = 0 ; + parameterCategory = 2 ; + parameterNumber = 64 ; + typeOfFirstFixedSurface = 1 ; + } +#Instantaneous northward turbulent surface stress due to orographic form drag +'N m**-2' = { + discipline = 0 ; + parameterCategory = 2 ; + parameterNumber = 65 ; + typeOfFirstFixedSurface = 1 ; + } +#Instantaneous eastward turbulent surface stress due to surface roughness +'N m**-2' = { + discipline = 0 ; + parameterCategory = 2 ; + parameterNumber = 66 ; + typeOfFirstFixedSurface = 1 ; + } +#Instantaneous northward turbulent surface stress due to surface roughness +'N m**-2' = { + discipline = 0 ; + parameterCategory = 2 ; + parameterNumber = 67 ; + typeOfFirstFixedSurface = 1 ; + } #Universal thermal climate index 'K' = { discipline = 20 ; From a1679fff755484f83d6edad9a489120f1f3d7d9f Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Mon, 12 Aug 2024 15:27:32 +0000 Subject: [PATCH 07/27] ECC-1880: GRIB2: Additions & modifications of instantaneous parameters for generalised time processing approach (part 2) --- .../grib1/localConcepts/ecmf/shortName.def | 6 +- .../grib2/localConcepts/era/shortName.def | 6 +- definitions/grib2/name.def | 123 ++++++++++++++++++ definitions/grib2/paramId.def | 123 ++++++++++++++++++ definitions/grib2/shortName.def | 123 ++++++++++++++++++ definitions/grib2/units.def | 123 ++++++++++++++++++ 6 files changed, 498 insertions(+), 6 deletions(-) diff --git a/definitions/grib1/localConcepts/ecmf/shortName.def b/definitions/grib1/localConcepts/ecmf/shortName.def index 176da8fca..54bee8119 100644 --- a/definitions/grib1/localConcepts/ecmf/shortName.def +++ b/definitions/grib1/localConcepts/ecmf/shortName.def @@ -13780,12 +13780,12 @@ indicatorOfParameter = 74 ; } #Vertical integral of eastward total energy flux -'vitoee' = { +'vitee' = { table2Version = 162 ; indicatorOfParameter = 75 ; } #Vertical integral of northward total energy flux -'vitoen' = { +'viten' = { table2Version = 162 ; indicatorOfParameter = 76 ; } @@ -13825,7 +13825,7 @@ indicatorOfParameter = 85 ; } #Vertical integral of divergence of total energy flux -'vitoed' = { +'vited' = { table2Version = 162 ; indicatorOfParameter = 86 ; } diff --git a/definitions/grib2/localConcepts/era/shortName.def b/definitions/grib2/localConcepts/era/shortName.def index 088ae3b62..eed1dffc3 100644 --- a/definitions/grib2/localConcepts/era/shortName.def +++ b/definitions/grib2/localConcepts/era/shortName.def @@ -687,13 +687,13 @@ parameterNumber = 74 ; } #Vertical integral of eastward total energy flux -'vitoee' = { +'vitee' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 75 ; } #Vertical integral of northward total energy flux -'vitoen' = { +'viten' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 76 ; @@ -735,7 +735,7 @@ parameterNumber = 85 ; } #Vertical integral of divergence of total energy flux -'vitoed' = { +'vited' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 86 ; diff --git a/definitions/grib2/name.def b/definitions/grib2/name.def index c5b34813d..6ab3901fb 100644 --- a/definitions/grib2/name.def +++ b/definitions/grib2/name.def @@ -11306,6 +11306,38 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } +#Vertical integral of eastward mass flux +'Vertical integral of eastward mass flux' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 36 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of northward mass flux +'Vertical integral of northward mass flux' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 37 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of eastward kinetic energy flux +'Vertical integral of eastward kinetic energy flux' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 9 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of northward kinetic energy flux +'Vertical integral of northward kinetic energy flux' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 10 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } #Vertical integral of eastward heat flux 'Vertical integral of eastward heat flux' = { discipline = 0 ; @@ -11338,6 +11370,72 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } +#Vertical integral of eastward geopotential flux +'Vertical integral of eastward geopotential flux' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 40 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of northward geopotential flux +'Vertical integral of northward geopotential flux' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 41 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of eastward total energy flux +'Vertical integral of eastward total energy flux' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 11 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of northward total energy flux +'Vertical integral of northward total energy flux' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 12 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of eastward ozone flux +'Vertical integral of eastward ozone flux' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 78 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + constituentType = 0 ; + } +#Vertical integral of northward ozone flux +'Vertical integral of northward ozone flux' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 79 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + constituentType = 0 ; + } +#Vertical integral of divergence of mass flux +'Vertical integral of divergence of mass flux' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 35 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of divergence of kinetic energy flux +'Vertical integral of divergence of kinetic energy flux' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 16 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } #Vertically integrated moisture divergence flux 'Vertically integrated moisture divergence flux' = { discipline = 0 ; @@ -11346,6 +11444,31 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } +#Vertical integral of divergence of geopotential flux +'Vertical integral of divergence of geopotential flux' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 43 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of divergence of total energy flux +'Vertical integral of divergence of total energy flux' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 17 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of divergence of ozone flux +'Vertical integral of divergence of ozone flux' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 80 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + constituentType = 0 ; + } #Time-integrated temperature tendency due to short-wave radiation 'Time-integrated temperature tendency due to short-wave radiation' = { discipline = 0 ; diff --git a/definitions/grib2/paramId.def b/definitions/grib2/paramId.def index 5f20eaa1a..fcafec803 100644 --- a/definitions/grib2/paramId.def +++ b/definitions/grib2/paramId.def @@ -11306,6 +11306,38 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } +#Vertical integral of eastward mass flux +'162065' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 36 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of northward mass flux +'162066' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 37 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of eastward kinetic energy flux +'162067' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 9 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of northward kinetic energy flux +'162068' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 10 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } #Vertical integral of eastward heat flux '162069' = { discipline = 0 ; @@ -11338,6 +11370,72 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } +#Vertical integral of eastward geopotential flux +'162073' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 40 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of northward geopotential flux +'162074' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 41 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of eastward total energy flux +'162075' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 11 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of northward total energy flux +'162076' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 12 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of eastward ozone flux +'162077' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 78 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + constituentType = 0 ; + } +#Vertical integral of northward ozone flux +'162078' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 79 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + constituentType = 0 ; + } +#Vertical integral of divergence of mass flux +'162081' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 35 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of divergence of kinetic energy flux +'162082' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 16 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } #Vertically integrated moisture divergence flux '162084' = { discipline = 0 ; @@ -11346,6 +11444,31 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } +#Vertical integral of divergence of geopotential flux +'162085' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 43 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of divergence of total energy flux +'162086' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 17 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of divergence of ozone flux +'162087' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 80 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + constituentType = 0 ; + } #Time-integrated temperature tendency due to short-wave radiation '162100' = { discipline = 0 ; diff --git a/definitions/grib2/shortName.def b/definitions/grib2/shortName.def index 7364f5e19..5ac01bed5 100644 --- a/definitions/grib2/shortName.def +++ b/definitions/grib2/shortName.def @@ -11306,6 +11306,38 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } +#Vertical integral of eastward mass flux +'vimae' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 36 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of northward mass flux +'viman' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 37 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of eastward kinetic energy flux +'vikee' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 9 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of northward kinetic energy flux +'viken' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 10 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } #Vertical integral of eastward heat flux 'vithee' = { discipline = 0 ; @@ -11338,6 +11370,72 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } +#Vertical integral of eastward geopotential flux +'vige' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 40 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of northward geopotential flux +'vign' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 41 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of eastward total energy flux +'vitee' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 11 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of northward total energy flux +'viten' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 12 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of eastward ozone flux +'vioze' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 78 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + constituentType = 0 ; + } +#Vertical integral of northward ozone flux +'viozn' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 79 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + constituentType = 0 ; + } +#Vertical integral of divergence of mass flux +'vimad' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 35 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of divergence of kinetic energy flux +'viked' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 16 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } #Vertically integrated moisture divergence flux 'viwvd' = { discipline = 0 ; @@ -11346,6 +11444,31 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } +#Vertical integral of divergence of geopotential flux +'vigd' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 43 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of divergence of total energy flux +'vited' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 17 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of divergence of ozone flux +'viozd' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 80 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + constituentType = 0 ; + } #Time-integrated temperature tendency due to short-wave radiation 'srta' = { discipline = 0 ; diff --git a/definitions/grib2/units.def b/definitions/grib2/units.def index 48f69386d..8ace3232b 100644 --- a/definitions/grib2/units.def +++ b/definitions/grib2/units.def @@ -11306,6 +11306,38 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } +#Vertical integral of eastward mass flux +'kg m**-1 s**-1' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 36 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of northward mass flux +'kg m**-1 s**-1' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 37 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of eastward kinetic energy flux +'W m**-1' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 9 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of northward kinetic energy flux +'W m**-1' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 10 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } #Vertical integral of eastward heat flux 'W m**-1' = { discipline = 0 ; @@ -11338,6 +11370,72 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } +#Vertical integral of eastward geopotential flux +'W m**-1' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 40 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of northward geopotential flux +'W m**-1' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 41 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of eastward total energy flux +'W m**-1' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 11 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of northward total energy flux +'W m**-1' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 12 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of eastward ozone flux +'kg m**-1 s**-1' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 78 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + constituentType = 0 ; + } +#Vertical integral of northward ozone flux +'kg m**-1 s**-1' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 79 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + constituentType = 0 ; + } +#Vertical integral of divergence of mass flux +'kg m**-2 s**-1' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 35 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of divergence of kinetic energy flux +'W m**-2' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 16 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } #Vertically integrated moisture divergence flux 'kg m**-2 s**-1' = { discipline = 0 ; @@ -11346,6 +11444,31 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } +#Vertical integral of divergence of geopotential flux +'W m**-2' = { + discipline = 0 ; + parameterCategory = 3 ; + parameterNumber = 43 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of divergence of total energy flux +'W m**-2' = { + discipline = 0 ; + parameterCategory = 21 ; + parameterNumber = 17 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + } +#Vertical integral of divergence of ozone flux +'kg m**-2 s**-1' = { + discipline = 0 ; + parameterCategory = 20 ; + parameterNumber = 80 ; + typeOfFirstFixedSurface = 1 ; + typeOfSecondFixedSurface = 8 ; + constituentType = 0 ; + } #Time-integrated temperature tendency due to short-wave radiation 'K' = { discipline = 0 ; From dd6c68e94d801e9825fefb35983e6fd631b9ef4c Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Mon, 12 Aug 2024 15:42:20 +0000 Subject: [PATCH 08/27] ECC-1886: Exclude retired parameters --- definitions/create_def.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/definitions/create_def.pl b/definitions/create_def.pl index 6d2f72602..2a76658be 100755 --- a/definitions/create_def.pl +++ b/definitions/create_def.pl @@ -199,6 +199,7 @@ sub create_cfVarName { centre.abbreviation,param_id,attribute.name,attribute_value,param.name,param.shortName from param,grib_encoding,grib,attribute,centre,units where param.hide_def=0 and + param.retired=0 and grib_encoding.id=grib.encoding_id and param.id=grib_encoding.param_id and attribute.id=grib.attribute_id and From 3e617ab7df8c1a1f7b0a5b342753830c1f3559c3 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Mon, 12 Aug 2024 15:44:02 +0000 Subject: [PATCH 09/27] ECC-1882: cfVarNames fixed properly --- definitions/grib2/cfVarName.def | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/definitions/grib2/cfVarName.def b/definitions/grib2/cfVarName.def index 9b7627d2b..ecfe94186 100644 --- a/definitions/grib2/cfVarName.def +++ b/definitions/grib2/cfVarName.def @@ -186,26 +186,6 @@ scaledValueOfFirstFixedSurface = 100 ; scaleFactorOfFirstFixedSurface = 0 ; } -#Time-maximum 2 metre relative humidity -'max_2r' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 1 ; - typeOfFirstFixedSurface = 103 ; - scaledValueOfFirstFixedSurface = 2 ; - scaleFactorOfFirstFixedSurface = 0 ; - typeOfStatisticalProcessing = 2 ; - } -#Time-minimum 2 metre relative humidity -'min_2r' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 1 ; - typeOfFirstFixedSurface = 103 ; - scaledValueOfFirstFixedSurface = 2 ; - scaleFactorOfFirstFixedSurface = 0 ; - typeOfStatisticalProcessing = 3 ; - } #Time-mean sea ice area fraction 'avg_ci' = { discipline = 10 ; From 9f0432deb0d0f57c8ac002b2d14236980d444674 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Mon, 12 Aug 2024 16:52:26 +0000 Subject: [PATCH 10/27] ECC-1880: GRIB2: Additions & modifications of instantaneous parameters for generalised time processing approach (part 3) --- .../grib1/localConcepts/ecmf/cfName.def | 24 +-- definitions/grib1/localConcepts/ecmf/name.def | 88 +++++----- .../grib1/localConcepts/ecmf/paramId.def | 44 ++--- .../grib1/localConcepts/ecmf/shortName.def | 48 +++--- .../grib1/localConcepts/ecmf/units.def | 46 +++--- definitions/grib1/localConcepts/rjtd/name.def | 16 +- .../grib1/localConcepts/rjtd/paramId.def | 8 +- .../grib1/localConcepts/rjtd/shortName.def | 16 +- .../grib1/localConcepts/rjtd/units.def | 8 +- definitions/grib2/cfName.def | 6 +- definitions/grib2/localConcepts/era6/name.def | 12 +- .../grib2/localConcepts/era6/paramId.def | 6 +- .../grib2/localConcepts/era6/shortName.def | 6 +- .../grib2/localConcepts/era6/units.def | 6 +- definitions/grib2/localConcepts/kwbc/name.def | 24 +-- .../grib2/localConcepts/kwbc/paramId.def | 12 +- .../grib2/localConcepts/kwbc/shortName.def | 26 +-- .../grib2/localConcepts/kwbc/units.def | 12 +- definitions/grib2/name.def | 154 ++++++++++-------- definitions/grib2/paramId.def | 90 ++++++---- definitions/grib2/shortName.def | 144 +++++++++------- definitions/grib2/units.def | 92 +++++++---- 22 files changed, 496 insertions(+), 392 deletions(-) diff --git a/definitions/grib1/localConcepts/ecmf/cfName.def b/definitions/grib1/localConcepts/ecmf/cfName.def index f1377da79..77263d572 100644 --- a/definitions/grib1/localConcepts/ecmf/cfName.def +++ b/definitions/grib1/localConcepts/ecmf/cfName.def @@ -284,62 +284,62 @@ table2Version = 180 ; indicatorOfParameter = 144 ; } -#Boundary layer dissipation +#Time-integrated boundary layer dissipation 'kinetic_energy_dissipation_in_atmosphere_boundary_layer' = { table2Version = 128 ; indicatorOfParameter = 145 ; } -#Boundary layer dissipation +#Time-integrated boundary layer dissipation 'kinetic_energy_dissipation_in_atmosphere_boundary_layer' = { table2Version = 160 ; indicatorOfParameter = 145 ; } -#Surface sensible heat flux +#Time-integrated surface sensible heat net flux 'surface_upward_sensible_heat_flux' = { table2Version = 128 ; indicatorOfParameter = 146 ; } -#Surface sensible heat flux +#Time-integrated surface sensible heat net flux 'surface_upward_sensible_heat_flux' = { table2Version = 160 ; indicatorOfParameter = 146 ; } -#Surface sensible heat flux +#Time-integrated surface sensible heat net flux 'surface_upward_sensible_heat_flux' = { table2Version = 170 ; indicatorOfParameter = 146 ; } -#Surface sensible heat flux +#Time-integrated surface sensible heat net flux 'surface_upward_sensible_heat_flux' = { table2Version = 180 ; indicatorOfParameter = 146 ; } -#Surface sensible heat flux +#Time-integrated surface sensible heat net flux 'surface_upward_sensible_heat_flux' = { table2Version = 190 ; indicatorOfParameter = 146 ; } -#Surface latent heat flux +#Time-integrated surface latent heat net flux 'surface_upward_latent_heat_flux' = { table2Version = 128 ; indicatorOfParameter = 147 ; } -#Surface latent heat flux +#Time-integrated surface latent heat net flux 'surface_upward_latent_heat_flux' = { table2Version = 160 ; indicatorOfParameter = 147 ; } -#Surface latent heat flux +#Time-integrated surface latent heat net flux 'surface_upward_latent_heat_flux' = { table2Version = 170 ; indicatorOfParameter = 147 ; } -#Surface latent heat flux +#Time-integrated surface latent heat net flux 'surface_upward_latent_heat_flux' = { table2Version = 180 ; indicatorOfParameter = 147 ; } -#Surface latent heat flux +#Time-integrated surface latent heat net flux 'surface_upward_latent_heat_flux' = { table2Version = 190 ; indicatorOfParameter = 147 ; diff --git a/definitions/grib1/localConcepts/ecmf/name.def b/definitions/grib1/localConcepts/ecmf/name.def index 5c89d1280..403b30e84 100644 --- a/definitions/grib1/localConcepts/ecmf/name.def +++ b/definitions/grib1/localConcepts/ecmf/name.def @@ -284,13 +284,13 @@ table2Version = 128 ; indicatorOfParameter = 46 ; } -#Direct solar radiation -'Direct solar radiation' = { +#Surface direct normal short-wave (solar) radiation +'Surface direct normal short-wave (solar) radiation' = { table2Version = 128 ; indicatorOfParameter = 47 ; } -#Magnitude of turbulent surface stress -'Magnitude of turbulent surface stress' = { +#Time-integrated magnitude of turbulent surface stress +'Time-integrated magnitude of turbulent surface stress' = { table2Version = 128 ; indicatorOfParameter = 48 ; } @@ -334,8 +334,8 @@ table2Version = 128 ; indicatorOfParameter = 56 ; } -#Downward UV radiation at the surface -'Downward UV radiation at the surface' = { +#Surface downward UV radiation +'Surface downward UV radiation' = { table2Version = 128 ; indicatorOfParameter = 57 ; } @@ -989,63 +989,63 @@ table2Version = 180 ; indicatorOfParameter = 144 ; } -#Boundary layer dissipation -'Boundary layer dissipation' = { +#Time-integrated boundary layer dissipation +'Time-integrated boundary layer dissipation' = { table2Version = 128 ; indicatorOfParameter = 145 ; } -#Boundary layer dissipation -'Boundary layer dissipation' = { +#Time-integrated boundary layer dissipation +'Time-integrated boundary layer dissipation' = { table2Version = 160 ; indicatorOfParameter = 145 ; } -#Surface sensible heat flux -'Surface sensible heat flux' = { +#Time-integrated surface sensible heat net flux +'Time-integrated surface sensible heat net flux' = { table2Version = 128 ; indicatorOfParameter = 146 ; } -#Surface sensible heat flux -'Surface sensible heat flux' = { +#Time-integrated surface sensible heat net flux +'Time-integrated surface sensible heat net flux' = { table2Version = 160 ; indicatorOfParameter = 146 ; } -#Surface sensible heat flux -'Surface sensible heat flux' = { +#Time-integrated surface sensible heat net flux +'Time-integrated surface sensible heat net flux' = { table2Version = 170 ; indicatorOfParameter = 146 ; } -#Surface sensible heat flux -'Surface sensible heat flux' = { +#Time-integrated surface sensible heat net flux +'Time-integrated surface sensible heat net flux' = { table2Version = 180 ; indicatorOfParameter = 146 ; } -#Surface sensible heat flux -'Surface sensible heat flux' = { +#Time-integrated surface sensible heat net flux +'Time-integrated surface sensible heat net flux' = { table2Version = 190 ; indicatorOfParameter = 146 ; } -#Surface latent heat flux -'Surface latent heat flux' = { +#Time-integrated surface latent heat net flux +'Time-integrated surface latent heat net flux' = { table2Version = 128 ; indicatorOfParameter = 147 ; } -#Surface latent heat flux -'Surface latent heat flux' = { +#Time-integrated surface latent heat net flux +'Time-integrated surface latent heat net flux' = { table2Version = 160 ; indicatorOfParameter = 147 ; } -#Surface latent heat flux -'Surface latent heat flux' = { +#Time-integrated surface latent heat net flux +'Time-integrated surface latent heat net flux' = { table2Version = 170 ; indicatorOfParameter = 147 ; } -#Surface latent heat flux -'Surface latent heat flux' = { +#Time-integrated surface latent heat net flux +'Time-integrated surface latent heat net flux' = { table2Version = 180 ; indicatorOfParameter = 147 ; } -#Surface latent heat flux -'Surface latent heat flux' = { +#Time-integrated surface latent heat net flux +'Time-integrated surface latent heat net flux' = { table2Version = 190 ; indicatorOfParameter = 147 ; } @@ -1894,8 +1894,8 @@ table2Version = 160 ; indicatorOfParameter = 230 ; } -#Instantaneous surface sensible heat flux -'Instantaneous surface sensible heat flux' = { +#Instantaneous surface sensible heat net flux +'Instantaneous surface sensible heat net flux' = { table2Version = 128 ; indicatorOfParameter = 231 ; } @@ -9879,8 +9879,8 @@ table2Version = 228 ; indicatorOfParameter = 20 ; } -#Total sky direct short-wave (solar) radiation at surface -'Total sky direct short-wave (solar) radiation at surface' = { +#Surface direct short-wave (solar) radiation +'Surface direct short-wave (solar) radiation' = { table2Version = 228 ; indicatorOfParameter = 21 ; } @@ -10039,18 +10039,18 @@ table2Version = 228 ; indicatorOfParameter = 82 ; } -#Flux of Carbon Dioxide Net Ecosystem Exchange -'Flux of Carbon Dioxide Net Ecosystem Exchange' = { +#Carbon dioxide net ecosystem exchange flux +'Carbon dioxide net ecosystem exchange flux' = { table2Version = 228 ; indicatorOfParameter = 83 ; } -#Flux of Carbon Dioxide Gross Primary Production -'Flux of Carbon Dioxide Gross Primary Production' = { +#Carbon dioxide gross primary production flux +'Carbon dioxide gross primary production flux' = { table2Version = 228 ; indicatorOfParameter = 84 ; } -#Flux of Carbon Dioxide Ecosystem Respiration -'Flux of Carbon Dioxide Ecosystem Respiration' = { +#Carbon dioxide ecosystem respiration flux +'Carbon dioxide ecosystem respiration flux' = { table2Version = 228 ; indicatorOfParameter = 85 ; } @@ -10104,8 +10104,8 @@ table2Version = 228 ; indicatorOfParameter = 216 ; } -#Instantaneous large-scale surface precipitation fraction -'Instantaneous large-scale surface precipitation fraction' = { +#Instantaneous large-scale precipitation fraction +'Instantaneous large-scale precipitation fraction' = { table2Version = 228 ; indicatorOfParameter = 217 ; } @@ -13814,8 +13814,8 @@ table2Version = 162 ; indicatorOfParameter = 83 ; } -#Vertically integrated moisture divergence flux -'Vertically integrated moisture divergence flux' = { +#Total column vertically-integrated moisture divergence flux +'Total column vertically-integrated moisture divergence flux' = { table2Version = 162 ; indicatorOfParameter = 84 ; } diff --git a/definitions/grib1/localConcepts/ecmf/paramId.def b/definitions/grib1/localConcepts/ecmf/paramId.def index f4dd85c70..e89a9a96a 100644 --- a/definitions/grib1/localConcepts/ecmf/paramId.def +++ b/definitions/grib1/localConcepts/ecmf/paramId.def @@ -284,12 +284,12 @@ table2Version = 128 ; indicatorOfParameter = 46 ; } -#Direct solar radiation +#Surface direct normal short-wave (solar) radiation '47' = { table2Version = 128 ; indicatorOfParameter = 47 ; } -#Magnitude of turbulent surface stress +#Time-integrated magnitude of turbulent surface stress '48' = { table2Version = 128 ; indicatorOfParameter = 48 ; @@ -334,7 +334,7 @@ table2Version = 128 ; indicatorOfParameter = 56 ; } -#Downward UV radiation at the surface +#Surface downward UV radiation '57' = { table2Version = 128 ; indicatorOfParameter = 57 ; @@ -989,62 +989,62 @@ table2Version = 180 ; indicatorOfParameter = 144 ; } -#Boundary layer dissipation +#Time-integrated boundary layer dissipation '145' = { table2Version = 128 ; indicatorOfParameter = 145 ; } -#Boundary layer dissipation +#Time-integrated boundary layer dissipation '145' = { table2Version = 160 ; indicatorOfParameter = 145 ; } -#Surface sensible heat flux +#Time-integrated surface sensible heat net flux '146' = { table2Version = 128 ; indicatorOfParameter = 146 ; } -#Surface sensible heat flux +#Time-integrated surface sensible heat net flux '146' = { table2Version = 160 ; indicatorOfParameter = 146 ; } -#Surface sensible heat flux +#Time-integrated surface sensible heat net flux '146' = { table2Version = 170 ; indicatorOfParameter = 146 ; } -#Surface sensible heat flux +#Time-integrated surface sensible heat net flux '146' = { table2Version = 180 ; indicatorOfParameter = 146 ; } -#Surface sensible heat flux +#Time-integrated surface sensible heat net flux '146' = { table2Version = 190 ; indicatorOfParameter = 146 ; } -#Surface latent heat flux +#Time-integrated surface latent heat net flux '147' = { table2Version = 128 ; indicatorOfParameter = 147 ; } -#Surface latent heat flux +#Time-integrated surface latent heat net flux '147' = { table2Version = 160 ; indicatorOfParameter = 147 ; } -#Surface latent heat flux +#Time-integrated surface latent heat net flux '147' = { table2Version = 170 ; indicatorOfParameter = 147 ; } -#Surface latent heat flux +#Time-integrated surface latent heat net flux '147' = { table2Version = 180 ; indicatorOfParameter = 147 ; } -#Surface latent heat flux +#Time-integrated surface latent heat net flux '147' = { table2Version = 190 ; indicatorOfParameter = 147 ; @@ -1894,7 +1894,7 @@ table2Version = 160 ; indicatorOfParameter = 230 ; } -#Instantaneous surface sensible heat flux +#Instantaneous surface sensible heat net flux '231' = { table2Version = 128 ; indicatorOfParameter = 231 ; @@ -9879,7 +9879,7 @@ table2Version = 228 ; indicatorOfParameter = 20 ; } -#Total sky direct short-wave (solar) radiation at surface +#Surface direct short-wave (solar) radiation '228021' = { table2Version = 228 ; indicatorOfParameter = 21 ; @@ -10039,17 +10039,17 @@ table2Version = 228 ; indicatorOfParameter = 82 ; } -#Flux of Carbon Dioxide Net Ecosystem Exchange +#Carbon dioxide net ecosystem exchange flux '228083' = { table2Version = 228 ; indicatorOfParameter = 83 ; } -#Flux of Carbon Dioxide Gross Primary Production +#Carbon dioxide gross primary production flux '228084' = { table2Version = 228 ; indicatorOfParameter = 84 ; } -#Flux of Carbon Dioxide Ecosystem Respiration +#Carbon dioxide ecosystem respiration flux '228085' = { table2Version = 228 ; indicatorOfParameter = 85 ; @@ -10104,7 +10104,7 @@ table2Version = 228 ; indicatorOfParameter = 216 ; } -#Instantaneous large-scale surface precipitation fraction +#Instantaneous large-scale precipitation fraction '228217' = { table2Version = 228 ; indicatorOfParameter = 217 ; @@ -13814,7 +13814,7 @@ table2Version = 162 ; indicatorOfParameter = 83 ; } -#Vertically integrated moisture divergence flux +#Total column vertically-integrated moisture divergence flux '162084' = { table2Version = 162 ; indicatorOfParameter = 84 ; diff --git a/definitions/grib1/localConcepts/ecmf/shortName.def b/definitions/grib1/localConcepts/ecmf/shortName.def index 54bee8119..c3429bc9d 100644 --- a/definitions/grib1/localConcepts/ecmf/shortName.def +++ b/definitions/grib1/localConcepts/ecmf/shortName.def @@ -284,12 +284,12 @@ table2Version = 128 ; indicatorOfParameter = 46 ; } -#Direct solar radiation +#Surface direct normal short-wave (solar) radiation 'dsrp' = { table2Version = 128 ; indicatorOfParameter = 47 ; } -#Magnitude of turbulent surface stress +#Time-integrated magnitude of turbulent surface stress 'magss' = { table2Version = 128 ; indicatorOfParameter = 48 ; @@ -334,7 +334,7 @@ table2Version = 128 ; indicatorOfParameter = 56 ; } -#Downward UV radiation at the surface +#Surface downward UV radiation 'uvb' = { table2Version = 128 ; indicatorOfParameter = 57 ; @@ -989,62 +989,62 @@ table2Version = 180 ; indicatorOfParameter = 144 ; } -#Boundary layer dissipation +#Time-integrated boundary layer dissipation 'bld' = { table2Version = 128 ; indicatorOfParameter = 145 ; } -#Boundary layer dissipation +#Time-integrated boundary layer dissipation 'bld' = { table2Version = 160 ; indicatorOfParameter = 145 ; } -#Surface sensible heat flux +#Time-integrated surface sensible heat net flux 'sshf' = { table2Version = 128 ; indicatorOfParameter = 146 ; } -#Surface sensible heat flux +#Time-integrated surface sensible heat net flux 'sshf' = { table2Version = 160 ; indicatorOfParameter = 146 ; } -#Surface sensible heat flux +#Time-integrated surface sensible heat net flux 'sshf' = { table2Version = 170 ; indicatorOfParameter = 146 ; } -#Surface sensible heat flux +#Time-integrated surface sensible heat net flux 'sshf' = { table2Version = 180 ; indicatorOfParameter = 146 ; } -#Surface sensible heat flux +#Time-integrated surface sensible heat net flux 'sshf' = { table2Version = 190 ; indicatorOfParameter = 146 ; } -#Surface latent heat flux +#Time-integrated surface latent heat net flux 'slhf' = { table2Version = 128 ; indicatorOfParameter = 147 ; } -#Surface latent heat flux +#Time-integrated surface latent heat net flux 'slhf' = { table2Version = 160 ; indicatorOfParameter = 147 ; } -#Surface latent heat flux +#Time-integrated surface latent heat net flux 'slhf' = { table2Version = 170 ; indicatorOfParameter = 147 ; } -#Surface latent heat flux +#Time-integrated surface latent heat net flux 'slhf' = { table2Version = 180 ; indicatorOfParameter = 147 ; } -#Surface latent heat flux +#Time-integrated surface latent heat net flux 'slhf' = { table2Version = 190 ; indicatorOfParameter = 147 ; @@ -1894,7 +1894,7 @@ table2Version = 160 ; indicatorOfParameter = 230 ; } -#Instantaneous surface sensible heat flux +#Instantaneous surface sensible heat net flux 'ishf' = { table2Version = 128 ; indicatorOfParameter = 231 ; @@ -9879,7 +9879,7 @@ table2Version = 228 ; indicatorOfParameter = 20 ; } -#Total sky direct short-wave (solar) radiation at surface +#Surface direct short-wave (solar) radiation 'fdir' = { table2Version = 228 ; indicatorOfParameter = 21 ; @@ -10039,17 +10039,17 @@ table2Version = 228 ; indicatorOfParameter = 82 ; } -#Flux of Carbon Dioxide Net Ecosystem Exchange +#Carbon dioxide net ecosystem exchange flux 'fco2nee' = { table2Version = 228 ; indicatorOfParameter = 83 ; } -#Flux of Carbon Dioxide Gross Primary Production +#Carbon dioxide gross primary production flux 'fco2gpp' = { table2Version = 228 ; indicatorOfParameter = 84 ; } -#Flux of Carbon Dioxide Ecosystem Respiration +#Carbon dioxide ecosystem respiration flux 'fco2rec' = { table2Version = 228 ; indicatorOfParameter = 85 ; @@ -10104,7 +10104,7 @@ table2Version = 228 ; indicatorOfParameter = 216 ; } -#Instantaneous large-scale surface precipitation fraction +#Instantaneous large-scale precipitation fraction 'ilspf' = { table2Version = 228 ; indicatorOfParameter = 217 ; @@ -13485,7 +13485,7 @@ indicatorOfParameter = 184 ; } #Skin reservoir content -'srcrea' = { +'srcon' = { table2Version = 160 ; indicatorOfParameter = 198 ; } @@ -13814,8 +13814,8 @@ table2Version = 162 ; indicatorOfParameter = 83 ; } -#Vertically integrated moisture divergence flux -'viwvd' = { +#Total column vertically-integrated moisture divergence flux +'vimdf' = { table2Version = 162 ; indicatorOfParameter = 84 ; } diff --git a/definitions/grib1/localConcepts/ecmf/units.def b/definitions/grib1/localConcepts/ecmf/units.def index dae3279fd..0217a43b1 100644 --- a/definitions/grib1/localConcepts/ecmf/units.def +++ b/definitions/grib1/localConcepts/ecmf/units.def @@ -284,12 +284,12 @@ table2Version = 128 ; indicatorOfParameter = 46 ; } -#Direct solar radiation +#Surface direct normal short-wave (solar) radiation 'J m**-2' = { table2Version = 128 ; indicatorOfParameter = 47 ; } -#Magnitude of turbulent surface stress +#Time-integrated magnitude of turbulent surface stress 'N m**-2 s' = { table2Version = 128 ; indicatorOfParameter = 48 ; @@ -334,7 +334,7 @@ table2Version = 128 ; indicatorOfParameter = 56 ; } -#Downward UV radiation at the surface +#Surface downward UV radiation 'J m**-2' = { table2Version = 128 ; indicatorOfParameter = 57 ; @@ -989,62 +989,62 @@ table2Version = 180 ; indicatorOfParameter = 144 ; } -#Boundary layer dissipation +#Time-integrated boundary layer dissipation 'J m**-2' = { table2Version = 128 ; indicatorOfParameter = 145 ; } -#Boundary layer dissipation +#Time-integrated boundary layer dissipation 'J m**-2' = { table2Version = 160 ; indicatorOfParameter = 145 ; } -#Surface sensible heat flux +#Time-integrated surface sensible heat net flux 'J m**-2' = { table2Version = 128 ; indicatorOfParameter = 146 ; } -#Surface sensible heat flux +#Time-integrated surface sensible heat net flux 'J m**-2' = { table2Version = 160 ; indicatorOfParameter = 146 ; } -#Surface sensible heat flux +#Time-integrated surface sensible heat net flux 'J m**-2' = { table2Version = 170 ; indicatorOfParameter = 146 ; } -#Surface sensible heat flux +#Time-integrated surface sensible heat net flux 'J m**-2' = { table2Version = 180 ; indicatorOfParameter = 146 ; } -#Surface sensible heat flux +#Time-integrated surface sensible heat net flux 'J m**-2' = { table2Version = 190 ; indicatorOfParameter = 146 ; } -#Surface latent heat flux +#Time-integrated surface latent heat net flux 'J m**-2' = { table2Version = 128 ; indicatorOfParameter = 147 ; } -#Surface latent heat flux +#Time-integrated surface latent heat net flux 'J m**-2' = { table2Version = 160 ; indicatorOfParameter = 147 ; } -#Surface latent heat flux +#Time-integrated surface latent heat net flux 'J m**-2' = { table2Version = 170 ; indicatorOfParameter = 147 ; } -#Surface latent heat flux +#Time-integrated surface latent heat net flux 'J m**-2' = { table2Version = 180 ; indicatorOfParameter = 147 ; } -#Surface latent heat flux +#Time-integrated surface latent heat net flux 'J m**-2' = { table2Version = 190 ; indicatorOfParameter = 147 ; @@ -1894,7 +1894,7 @@ table2Version = 160 ; indicatorOfParameter = 230 ; } -#Instantaneous surface sensible heat flux +#Instantaneous surface sensible heat net flux 'W m**-2' = { table2Version = 128 ; indicatorOfParameter = 231 ; @@ -9879,7 +9879,7 @@ table2Version = 228 ; indicatorOfParameter = 20 ; } -#Total sky direct short-wave (solar) radiation at surface +#Surface direct short-wave (solar) radiation 'J m**-2' = { table2Version = 228 ; indicatorOfParameter = 21 ; @@ -10039,17 +10039,17 @@ table2Version = 228 ; indicatorOfParameter = 82 ; } -#Flux of Carbon Dioxide Net Ecosystem Exchange +#Carbon dioxide net ecosystem exchange flux 'kg m**-2 s**-1' = { table2Version = 228 ; indicatorOfParameter = 83 ; } -#Flux of Carbon Dioxide Gross Primary Production +#Carbon dioxide gross primary production flux 'kg m**-2 s**-1' = { table2Version = 228 ; indicatorOfParameter = 84 ; } -#Flux of Carbon Dioxide Ecosystem Respiration +#Carbon dioxide ecosystem respiration flux 'kg m**-2 s**-1' = { table2Version = 228 ; indicatorOfParameter = 85 ; @@ -10104,8 +10104,8 @@ table2Version = 228 ; indicatorOfParameter = 216 ; } -#Instantaneous large-scale surface precipitation fraction -'(0 - 1)' = { +#Instantaneous large-scale precipitation fraction +'Proportion' = { table2Version = 228 ; indicatorOfParameter = 217 ; } @@ -13814,7 +13814,7 @@ table2Version = 162 ; indicatorOfParameter = 83 ; } -#Vertically integrated moisture divergence flux +#Total column vertically-integrated moisture divergence flux 'kg m**-2 s**-1' = { table2Version = 162 ; indicatorOfParameter = 84 ; diff --git a/definitions/grib1/localConcepts/rjtd/name.def b/definitions/grib1/localConcepts/rjtd/name.def index d23af9d8e..284c4b0b7 100644 --- a/definitions/grib1/localConcepts/rjtd/name.def +++ b/definitions/grib1/localConcepts/rjtd/name.def @@ -218,23 +218,23 @@ table2Version = 200 ; indicatorOfParameter = 219 ; } -#Downward short-wave radiation flux -'Downward short-wave radiation flux' = { +#Surface downward short-wave radiation flux +'Surface downward short-wave radiation flux' = { table2Version = 200 ; indicatorOfParameter = 204 ; } -#Upward short-wave radiation flux -'Upward short-wave radiation flux' = { +#Surface upward short-wave radiation flux +'Surface upward short-wave radiation flux' = { table2Version = 200 ; indicatorOfParameter = 211 ; } -#Downward long-wave radiation flux -'Downward long-wave radiation flux' = { +#Surface downward long-wave radiation flux +'Surface downward long-wave radiation flux' = { table2Version = 200 ; indicatorOfParameter = 205 ; } -#Upward long-wave radiation flux -'Upward long-wave radiation flux' = { +#Surface upward long-wave radiation flux +'Surface upward long-wave radiation flux' = { table2Version = 200 ; indicatorOfParameter = 212 ; } diff --git a/definitions/grib1/localConcepts/rjtd/paramId.def b/definitions/grib1/localConcepts/rjtd/paramId.def index d08f41247..640b96537 100644 --- a/definitions/grib1/localConcepts/rjtd/paramId.def +++ b/definitions/grib1/localConcepts/rjtd/paramId.def @@ -218,22 +218,22 @@ table2Version = 200 ; indicatorOfParameter = 219 ; } -#Downward short-wave radiation flux +#Surface downward short-wave radiation flux '260087' = { table2Version = 200 ; indicatorOfParameter = 204 ; } -#Upward short-wave radiation flux +#Surface upward short-wave radiation flux '260088' = { table2Version = 200 ; indicatorOfParameter = 211 ; } -#Downward long-wave radiation flux +#Surface downward long-wave radiation flux '260097' = { table2Version = 200 ; indicatorOfParameter = 205 ; } -#Upward long-wave radiation flux +#Surface upward long-wave radiation flux '260098' = { table2Version = 200 ; indicatorOfParameter = 212 ; diff --git a/definitions/grib1/localConcepts/rjtd/shortName.def b/definitions/grib1/localConcepts/rjtd/shortName.def index 10b57b914..6ddcc6e86 100644 --- a/definitions/grib1/localConcepts/rjtd/shortName.def +++ b/definitions/grib1/localConcepts/rjtd/shortName.def @@ -218,23 +218,23 @@ table2Version = 200 ; indicatorOfParameter = 219 ; } -#Downward short-wave radiation flux -'dswrf' = { +#Surface downward short-wave radiation flux +'sdswrf' = { table2Version = 200 ; indicatorOfParameter = 204 ; } -#Upward short-wave radiation flux -'uswrf' = { +#Surface upward short-wave radiation flux +'suswrf' = { table2Version = 200 ; indicatorOfParameter = 211 ; } -#Downward long-wave radiation flux -'dlwrf' = { +#Surface downward long-wave radiation flux +'sdlwrf' = { table2Version = 200 ; indicatorOfParameter = 205 ; } -#Upward long-wave radiation flux -'ulwrf' = { +#Surface upward long-wave radiation flux +'sulwrf' = { table2Version = 200 ; indicatorOfParameter = 212 ; } diff --git a/definitions/grib1/localConcepts/rjtd/units.def b/definitions/grib1/localConcepts/rjtd/units.def index 8e177dd35..b3df8c50e 100644 --- a/definitions/grib1/localConcepts/rjtd/units.def +++ b/definitions/grib1/localConcepts/rjtd/units.def @@ -218,22 +218,22 @@ table2Version = 200 ; indicatorOfParameter = 219 ; } -#Downward short-wave radiation flux +#Surface downward short-wave radiation flux 'W m**-2' = { table2Version = 200 ; indicatorOfParameter = 204 ; } -#Upward short-wave radiation flux +#Surface upward short-wave radiation flux 'W m**-2' = { table2Version = 200 ; indicatorOfParameter = 211 ; } -#Downward long-wave radiation flux +#Surface downward long-wave radiation flux 'W m**-2' = { table2Version = 200 ; indicatorOfParameter = 205 ; } -#Upward long-wave radiation flux +#Surface upward long-wave radiation flux 'W m**-2' = { table2Version = 200 ; indicatorOfParameter = 212 ; diff --git a/definitions/grib2/cfName.def b/definitions/grib2/cfName.def index c48900633..4ebf8d332 100644 --- a/definitions/grib2/cfName.def +++ b/definitions/grib2/cfName.def @@ -63,14 +63,14 @@ parameterCategory = 2 ; parameterNumber = 12 ; } -#Boundary layer dissipation +#Time-integrated boundary layer dissipation 'kinetic_energy_dissipation_in_atmosphere_boundary_layer' = { discipline = 0 ; parameterCategory = 2 ; parameterNumber = 20 ; typeOfStatisticalProcessing = 1 ; } -#Surface sensible heat flux +#Time-integrated surface sensible heat net flux 'surface_upward_sensible_heat_flux' = { discipline = 0 ; parameterCategory = 0 ; @@ -78,7 +78,7 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Surface latent heat flux +#Time-integrated surface latent heat net flux 'surface_upward_latent_heat_flux' = { discipline = 0 ; parameterCategory = 0 ; diff --git a/definitions/grib2/localConcepts/era6/name.def b/definitions/grib2/localConcepts/era6/name.def index af79f7845..6115bfbef 100644 --- a/definitions/grib2/localConcepts/era6/name.def +++ b/definitions/grib2/localConcepts/era6/name.def @@ -350,24 +350,24 @@ typeOfStatisticalProcessing = 1 ; is_chemical = 1 ; } -#Flux of Carbon Dioxide Net Ecosystem Exchange -'Flux of Carbon Dioxide Net Ecosystem Exchange' = { +#Carbon dioxide net ecosystem exchange flux +'Carbon dioxide net ecosystem exchange flux' = { discipline = 2 ; parameterCategory = 0 ; parameterNumber = 59 ; constituentType = 3 ; is_chemical = 1 ; } -#Flux of Carbon Dioxide Gross Primary Production -'Flux of Carbon Dioxide Gross Primary Production' = { +#Carbon dioxide gross primary production flux +'Carbon dioxide gross primary production flux' = { discipline = 2 ; parameterCategory = 0 ; parameterNumber = 60 ; constituentType = 3 ; is_chemical = 1 ; } -#Flux of Carbon Dioxide Ecosystem Respiration -'Flux of Carbon Dioxide Ecosystem Respiration' = { +#Carbon dioxide ecosystem respiration flux +'Carbon dioxide ecosystem respiration flux' = { discipline = 2 ; parameterCategory = 0 ; parameterNumber = 61 ; diff --git a/definitions/grib2/localConcepts/era6/paramId.def b/definitions/grib2/localConcepts/era6/paramId.def index efa120d15..00d86b9ba 100644 --- a/definitions/grib2/localConcepts/era6/paramId.def +++ b/definitions/grib2/localConcepts/era6/paramId.def @@ -350,7 +350,7 @@ typeOfStatisticalProcessing = 1 ; is_chemical = 1 ; } -#Flux of Carbon Dioxide Net Ecosystem Exchange +#Carbon dioxide net ecosystem exchange flux '228083' = { discipline = 2 ; parameterCategory = 0 ; @@ -358,7 +358,7 @@ constituentType = 3 ; is_chemical = 1 ; } -#Flux of Carbon Dioxide Gross Primary Production +#Carbon dioxide gross primary production flux '228084' = { discipline = 2 ; parameterCategory = 0 ; @@ -366,7 +366,7 @@ constituentType = 3 ; is_chemical = 1 ; } -#Flux of Carbon Dioxide Ecosystem Respiration +#Carbon dioxide ecosystem respiration flux '228085' = { discipline = 2 ; parameterCategory = 0 ; diff --git a/definitions/grib2/localConcepts/era6/shortName.def b/definitions/grib2/localConcepts/era6/shortName.def index 118656c0f..6976a2397 100644 --- a/definitions/grib2/localConcepts/era6/shortName.def +++ b/definitions/grib2/localConcepts/era6/shortName.def @@ -350,7 +350,7 @@ typeOfStatisticalProcessing = 1 ; is_chemical = 1 ; } -#Flux of Carbon Dioxide Net Ecosystem Exchange +#Carbon dioxide net ecosystem exchange flux 'fco2nee' = { discipline = 2 ; parameterCategory = 0 ; @@ -358,7 +358,7 @@ constituentType = 3 ; is_chemical = 1 ; } -#Flux of Carbon Dioxide Gross Primary Production +#Carbon dioxide gross primary production flux 'fco2gpp' = { discipline = 2 ; parameterCategory = 0 ; @@ -366,7 +366,7 @@ constituentType = 3 ; is_chemical = 1 ; } -#Flux of Carbon Dioxide Ecosystem Respiration +#Carbon dioxide ecosystem respiration flux 'fco2rec' = { discipline = 2 ; parameterCategory = 0 ; diff --git a/definitions/grib2/localConcepts/era6/units.def b/definitions/grib2/localConcepts/era6/units.def index edd86225f..edadfafe8 100644 --- a/definitions/grib2/localConcepts/era6/units.def +++ b/definitions/grib2/localConcepts/era6/units.def @@ -350,7 +350,7 @@ typeOfStatisticalProcessing = 1 ; is_chemical = 1 ; } -#Flux of Carbon Dioxide Net Ecosystem Exchange +#Carbon dioxide net ecosystem exchange flux 'kg m**-2 s**-1' = { discipline = 2 ; parameterCategory = 0 ; @@ -358,7 +358,7 @@ constituentType = 3 ; is_chemical = 1 ; } -#Flux of Carbon Dioxide Gross Primary Production +#Carbon dioxide gross primary production flux 'kg m**-2 s**-1' = { discipline = 2 ; parameterCategory = 0 ; @@ -366,7 +366,7 @@ constituentType = 3 ; is_chemical = 1 ; } -#Flux of Carbon Dioxide Ecosystem Respiration +#Carbon dioxide ecosystem respiration flux 'kg m**-2 s**-1' = { discipline = 2 ; parameterCategory = 0 ; diff --git a/definitions/grib2/localConcepts/kwbc/name.def b/definitions/grib2/localConcepts/kwbc/name.def index 2f6a1c3be..56b7b2087 100644 --- a/definitions/grib2/localConcepts/kwbc/name.def +++ b/definitions/grib2/localConcepts/kwbc/name.def @@ -143,14 +143,14 @@ parameterCategory = 3 ; parameterNumber = 193 ; } -#Zonal flux of gravity wave stress -'Zonal flux of gravity wave stress' = { +#Instantaneous eastward gravity wave surface stress +'Instantaneous eastward gravity wave surface stress' = { discipline = 0 ; parameterCategory = 3 ; parameterNumber = 194 ; } -#Meridional flux of gravity wave stress -'Meridional flux of gravity wave stress' = { +#Instantaneous northward gravity wave surface stress +'Instantaneous northward gravity wave surface stress' = { discipline = 0 ; parameterCategory = 3 ; parameterNumber = 195 ; @@ -161,14 +161,14 @@ parameterCategory = 3 ; parameterNumber = 197 ; } -#Downward short-wave radiation flux -'Downward short-wave radiation flux' = { +#Surface downward short-wave radiation flux +'Surface downward short-wave radiation flux' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 192 ; } -#Upward short-wave radiation flux -'Upward short-wave radiation flux' = { +#Surface upward short-wave radiation flux +'Surface upward short-wave radiation flux' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 193 ; @@ -179,14 +179,14 @@ parameterCategory = 7 ; parameterNumber = 196 ; } -#Downward long-wave radiation flux -'Downward long-wave radiation flux' = { +#Surface downward long-wave radiation flux +'Surface downward long-wave radiation flux' = { discipline = 0 ; parameterCategory = 5 ; parameterNumber = 192 ; } -#Upward long-wave radiation flux -'Upward long-wave radiation flux' = { +#Surface upward long-wave radiation flux +'Surface upward long-wave radiation flux' = { discipline = 0 ; parameterCategory = 5 ; parameterNumber = 193 ; diff --git a/definitions/grib2/localConcepts/kwbc/paramId.def b/definitions/grib2/localConcepts/kwbc/paramId.def index 8add9d28a..78837c822 100644 --- a/definitions/grib2/localConcepts/kwbc/paramId.def +++ b/definitions/grib2/localConcepts/kwbc/paramId.def @@ -143,13 +143,13 @@ parameterCategory = 3 ; parameterNumber = 193 ; } -#Zonal flux of gravity wave stress +#Instantaneous eastward gravity wave surface stress '260081' = { discipline = 0 ; parameterCategory = 3 ; parameterNumber = 194 ; } -#Meridional flux of gravity wave stress +#Instantaneous northward gravity wave surface stress '260082' = { discipline = 0 ; parameterCategory = 3 ; @@ -161,13 +161,13 @@ parameterCategory = 3 ; parameterNumber = 197 ; } -#Downward short-wave radiation flux +#Surface downward short-wave radiation flux '260087' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 192 ; } -#Upward short-wave radiation flux +#Surface upward short-wave radiation flux '260088' = { discipline = 0 ; parameterCategory = 4 ; @@ -179,13 +179,13 @@ parameterCategory = 7 ; parameterNumber = 196 ; } -#Downward long-wave radiation flux +#Surface downward long-wave radiation flux '260097' = { discipline = 0 ; parameterCategory = 5 ; parameterNumber = 192 ; } -#Upward long-wave radiation flux +#Surface upward long-wave radiation flux '260098' = { discipline = 0 ; parameterCategory = 5 ; diff --git a/definitions/grib2/localConcepts/kwbc/shortName.def b/definitions/grib2/localConcepts/kwbc/shortName.def index 9c925f00e..96c2ed66e 100644 --- a/definitions/grib2/localConcepts/kwbc/shortName.def +++ b/definitions/grib2/localConcepts/kwbc/shortName.def @@ -48,7 +48,7 @@ parameterNumber = 195 ; } #Convective precipitation rate -'cprat' = { +'cpr' = { discipline = 0 ; parameterCategory = 1 ; parameterNumber = 196 ; @@ -143,14 +143,14 @@ parameterCategory = 3 ; parameterNumber = 193 ; } -#Zonal flux of gravity wave stress -'u-gwd' = { +#Instantaneous eastward gravity wave surface stress +'iegwss' = { discipline = 0 ; parameterCategory = 3 ; parameterNumber = 194 ; } -#Meridional flux of gravity wave stress -'v-gwd' = { +#Instantaneous northward gravity wave surface stress +'ingwss' = { discipline = 0 ; parameterCategory = 3 ; parameterNumber = 195 ; @@ -161,14 +161,14 @@ parameterCategory = 3 ; parameterNumber = 197 ; } -#Downward short-wave radiation flux -'dswrf' = { +#Surface downward short-wave radiation flux +'sdswrf' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 192 ; } -#Upward short-wave radiation flux -'uswrf' = { +#Surface upward short-wave radiation flux +'suswrf' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 193 ; @@ -179,14 +179,14 @@ parameterCategory = 7 ; parameterNumber = 196 ; } -#Downward long-wave radiation flux -'dlwrf' = { +#Surface downward long-wave radiation flux +'sdlwrf' = { discipline = 0 ; parameterCategory = 5 ; parameterNumber = 192 ; } -#Upward long-wave radiation flux -'ulwrf' = { +#Surface upward long-wave radiation flux +'sulwrf' = { discipline = 0 ; parameterCategory = 5 ; parameterNumber = 193 ; diff --git a/definitions/grib2/localConcepts/kwbc/units.def b/definitions/grib2/localConcepts/kwbc/units.def index 37c4a287a..cc5ed58da 100644 --- a/definitions/grib2/localConcepts/kwbc/units.def +++ b/definitions/grib2/localConcepts/kwbc/units.def @@ -143,13 +143,13 @@ parameterCategory = 3 ; parameterNumber = 193 ; } -#Zonal flux of gravity wave stress +#Instantaneous eastward gravity wave surface stress 'N m**-2' = { discipline = 0 ; parameterCategory = 3 ; parameterNumber = 194 ; } -#Meridional flux of gravity wave stress +#Instantaneous northward gravity wave surface stress 'N m**-2' = { discipline = 0 ; parameterCategory = 3 ; @@ -161,13 +161,13 @@ parameterCategory = 3 ; parameterNumber = 197 ; } -#Downward short-wave radiation flux +#Surface downward short-wave radiation flux 'W m**-2' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 192 ; } -#Upward short-wave radiation flux +#Surface upward short-wave radiation flux 'W m**-2' = { discipline = 0 ; parameterCategory = 4 ; @@ -179,13 +179,13 @@ parameterCategory = 7 ; parameterNumber = 196 ; } -#Downward long-wave radiation flux +#Surface downward long-wave radiation flux 'W m**-2' = { discipline = 0 ; parameterCategory = 5 ; parameterNumber = 192 ; } -#Upward long-wave radiation flux +#Surface upward long-wave radiation flux 'W m**-2' = { discipline = 0 ; parameterCategory = 5 ; diff --git a/definitions/grib2/name.def b/definitions/grib2/name.def index 6ab3901fb..d8c5a96fe 100644 --- a/definitions/grib2/name.def +++ b/definitions/grib2/name.def @@ -237,8 +237,8 @@ parameterCategory = 3 ; parameterNumber = 0 ; } -#Direct solar radiation -'Direct solar radiation' = { +#Surface direct normal short-wave (solar) radiation +'Surface direct normal short-wave (solar) radiation' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 54 ; @@ -246,8 +246,8 @@ typeOfSecondFixedSurface = 255 ; typeOfStatisticalProcessing = 1 ; } -#Magnitude of turbulent surface stress -'Magnitude of turbulent surface stress' = { +#Time-integrated magnitude of turbulent surface stress +'Time-integrated magnitude of turbulent surface stress' = { discipline = 0 ; parameterCategory = 2 ; parameterNumber = 58 ; @@ -284,8 +284,8 @@ parameterCategory = 3 ; parameterNumber = 0 ; } -#Downward UV radiation at the surface -'Downward UV radiation at the surface' = { +#Surface downward UV radiation +'Surface downward UV radiation' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 12 ; @@ -463,23 +463,23 @@ parameterCategory = 2 ; parameterNumber = 12 ; } -#Boundary layer dissipation -'Boundary layer dissipation' = { +#Time-integrated boundary layer dissipation +'Time-integrated boundary layer dissipation' = { discipline = 0 ; parameterCategory = 2 ; parameterNumber = 20 ; typeOfStatisticalProcessing = 1 ; } -#Surface sensible heat flux -'Surface sensible heat flux' = { +#Time-integrated surface sensible heat net flux +'Time-integrated surface sensible heat net flux' = { discipline = 0 ; parameterCategory = 0 ; parameterNumber = 11 ; typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Surface latent heat flux -'Surface latent heat flux' = { +#Time-integrated surface latent heat net flux +'Time-integrated surface latent heat net flux' = { discipline = 0 ; parameterCategory = 0 ; parameterNumber = 10 ; @@ -813,8 +813,8 @@ parameterNumber = 63 ; typeOfFirstFixedSurface = 1 ; } -#Instantaneous surface sensible heat flux -'Instantaneous surface sensible heat flux' = { +#Instantaneous surface sensible heat net flux +'Instantaneous surface sensible heat net flux' = { discipline = 0 ; parameterCategory = 0 ; parameterNumber = 11 ; @@ -3052,8 +3052,8 @@ scaledValueOfFirstFixedSurface = 26315 ; scaleFactorOfFirstFixedSurface = 2 ; } -#Total sky direct short-wave (solar) radiation at surface -'Total sky direct short-wave (solar) radiation at surface' = { +#Surface direct short-wave (solar) radiation +'Surface direct short-wave (solar) radiation' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 13 ; @@ -3427,8 +3427,8 @@ parameterCategory = 0 ; parameterNumber = 33 ; } -#Instantaneous large-scale surface precipitation fraction -'Instantaneous large-scale surface precipitation fraction' = { +#Instantaneous large-scale precipitation fraction +'Instantaneous large-scale precipitation fraction' = { discipline = 0 ; parameterCategory = 6 ; parameterNumber = 36 ; @@ -4301,8 +4301,8 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated divergence of mass flux -'Time integrated, vertically integrated divergence of mass flux' = { +#Time-integrated, total column vertically-integrated divergence of mass flux +'Time-integrated, total column vertically-integrated divergence of mass flux' = { discipline = 0 ; parameterCategory = 3 ; parameterNumber = 35 ; @@ -4310,8 +4310,8 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated eastward mass flux -'Time integrated, vertically integrated eastward mass flux' = { +#Time-integrated, total column vertically-integrated eastward mass flux +'Time-integrated, total column vertically-integrated eastward mass flux' = { discipline = 0 ; parameterCategory = 3 ; parameterNumber = 36 ; @@ -4319,8 +4319,8 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated northward mass flux -'Time integrated, vertically integrated northward mass flux' = { +#Time-integrated, total column vertically-integrated northward mass flux +'Time-integrated, total column vertically-integrated northward mass flux' = { discipline = 0 ; parameterCategory = 3 ; parameterNumber = 37 ; @@ -5925,11 +5925,12 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Latent heat net flux -'Latent heat net flux' = { +#Surface latent heat net flux +'Surface latent heat net flux' = { discipline = 0 ; parameterCategory = 0 ; parameterNumber = 10 ; + typeOfFirstFixedSurface = 1 ; } #Heat index 'Heat index' = { @@ -6112,6 +6113,7 @@ discipline = 0 ; parameterCategory = 1 ; parameterNumber = 37 ; + typeOfFirstFixedSurface = 1 ; } #Horizontal moisture divergence 'Horizontal moisture divergence' = { @@ -6205,12 +6207,14 @@ discipline = 0 ; parameterCategory = 1 ; parameterNumber = 53 ; + typeOfFirstFixedSurface = 1 ; } #Large scale precipitation rate 'Large scale precipitation rate' = { discipline = 0 ; parameterCategory = 1 ; parameterNumber = 54 ; + typeOfFirstFixedSurface = 1 ; } #Total snowfall rate 'Total snowfall rate' = { @@ -6253,6 +6257,7 @@ discipline = 0 ; parameterCategory = 1 ; parameterNumber = 67 ; + typeOfFirstFixedSurface = 1 ; } #Ice pellets precipitation rate 'Ice pellets precipitation rate' = { @@ -6356,17 +6361,19 @@ parameterCategory = 3 ; parameterNumber = 15 ; } -#Zonal flux of gravity wave stress -'Zonal flux of gravity wave stress' = { +#Instantaneous eastward gravity wave surface stress +'Instantaneous eastward gravity wave surface stress' = { discipline = 0 ; parameterCategory = 3 ; parameterNumber = 16 ; + typeOfFirstFixedSurface = 1 ; } -#Meridional flux of gravity wave stress -'Meridional flux of gravity wave stress' = { +#Instantaneous northward gravity wave surface stress +'Instantaneous northward gravity wave surface stress' = { discipline = 0 ; parameterCategory = 3 ; parameterNumber = 17 ; + typeOfFirstFixedSurface = 1 ; } #5-wave geopotential height anomaly '5-wave geopotential height anomaly' = { @@ -6380,41 +6387,47 @@ parameterCategory = 4 ; parameterNumber = 1 ; } -#Downward short-wave radiation flux -'Downward short-wave radiation flux' = { +#Surface downward short-wave radiation flux +'Surface downward short-wave radiation flux' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 7 ; + typeOfFirstFixedSurface = 1 ; } -#Upward short-wave radiation flux -'Upward short-wave radiation flux' = { +#Surface upward short-wave radiation flux +'Surface upward short-wave radiation flux' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 8 ; + typeOfFirstFixedSurface = 1 ; } -#Net short wave radiation flux -'Net short wave radiation flux' = { +#Surface net short-wave radiation flux +'Surface net short-wave radiation flux' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 9 ; + typeOfFirstFixedSurface = 1 ; } -#Photosynthetically active radiation -'Photosynthetically active radiation' = { +#Surface photosynthetically active radiation flux +'Surface photosynthetically active radiation flux' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 10 ; + typeOfFirstFixedSurface = 1 ; } -#Net short-wave radiation flux, clear sky -'Net short-wave radiation flux, clear sky' = { +#Surface net short-wave radiation flux, clear sky +'Surface net short-wave radiation flux, clear sky' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 11 ; + typeOfFirstFixedSurface = 1 ; } -#Downward UV radiation -'Downward UV radiation' = { +#Surface downward UV radiation flux +'Surface downward UV radiation flux' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 12 ; + typeOfFirstFixedSurface = 1 ; } #UV index (under clear sky) 'UV index (under clear sky)' = { @@ -6440,29 +6453,33 @@ parameterCategory = 5 ; parameterNumber = 1 ; } -#Downward long-wave radiation flux -'Downward long-wave radiation flux' = { +#Surface downward long-wave radiation flux +'Surface downward long-wave radiation flux' = { discipline = 0 ; parameterCategory = 5 ; parameterNumber = 3 ; + typeOfFirstFixedSurface = 1 ; } -#Upward long-wave radiation flux -'Upward long-wave radiation flux' = { +#Surface upward long-wave radiation flux +'Surface upward long-wave radiation flux' = { discipline = 0 ; parameterCategory = 5 ; parameterNumber = 4 ; + typeOfFirstFixedSurface = 1 ; } -#Net long wave radiation flux -'Net long wave radiation flux' = { +#Surface net long-wave radiation flux +'Surface net long-wave radiation flux' = { discipline = 0 ; parameterCategory = 5 ; parameterNumber = 5 ; + typeOfFirstFixedSurface = 1 ; } -#Net long-wave radiation flux, clear sky -'Net long-wave radiation flux, clear sky' = { +#Surface net long-wave radiation flux, clear sky +'Surface net long-wave radiation flux, clear sky' = { discipline = 0 ; parameterCategory = 5 ; parameterNumber = 6 ; + typeOfFirstFixedSurface = 1 ; } #Cloud Ice 'Cloud Ice' = { @@ -6571,6 +6588,7 @@ discipline = 0 ; parameterCategory = 6 ; parameterNumber = 24 ; + typeOfFirstFixedSurface = 1 ; } #Horizontal extent of cumulonimbus (CB) 'Horizontal extent of cumulonimbus (CB)' = { @@ -7272,17 +7290,19 @@ scaledValueOfFirstFixedSurface = 10 ; scaleFactorOfFirstFixedSurface = 0 ; } -#Direct short wave radiation flux -'Direct short wave radiation flux' = { +#Surface direct short-wave radiation flux +'Surface direct short-wave radiation flux' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 13 ; + typeOfFirstFixedSurface = 1 ; } -#Diffuse short wave radiation flux -'Diffuse short wave radiation flux' = { +#Surface diffuse short-wave radiation flux +'Surface diffuse short-wave radiation flux' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 14 ; + typeOfFirstFixedSurface = 1 ; } #Fraction of snow cover 'Fraction of snow cover' = { @@ -7380,23 +7400,26 @@ parameterCategory = 3 ; parameterNumber = 18 ; } -#Downward short-wave radiation flux, clear sky -'Downward short-wave radiation flux, clear sky' = { +#Surface downward short-wave radiation flux, clear sky +'Surface downward short-wave radiation flux, clear sky' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 52 ; + typeOfFirstFixedSurface = 1 ; } -#Upward short-wave radiation flux, clear sky -'Upward short-wave radiation flux, clear sky' = { +#Surface upward short-wave radiation flux, clear sky +'Surface upward short-wave radiation flux, clear sky' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 53 ; + typeOfFirstFixedSurface = 1 ; } -#Downward long-wave radiation flux, clear sky -'Downward long-wave radiation flux, clear sky' = { +#Surface downward long-wave radiation flux, clear sky +'Surface downward long-wave radiation flux, clear sky' = { discipline = 0 ; parameterCategory = 5 ; parameterNumber = 8 ; + typeOfFirstFixedSurface = 1 ; } #Soil heat flux 'Soil heat flux' = { @@ -7450,15 +7473,17 @@ discipline = 2 ; parameterCategory = 0 ; parameterNumber = 39 ; + typeOfFirstFixedSurface = 1 ; } #Potential evapotranspiration rate 'Potential evapotranspiration rate' = { discipline = 2 ; parameterCategory = 0 ; parameterNumber = 40 ; + typeOfFirstFixedSurface = 1 ; } -#Water runoff and drainage rate -'Water runoff and drainage rate' = { +#Runoff rate water equivalent (surface plus subsurface) +'Runoff rate water equivalent (surface plus subsurface)' = { discipline = 2 ; parameterCategory = 0 ; parameterNumber = 42 ; @@ -7468,6 +7493,7 @@ discipline = 2 ; parameterCategory = 0 ; parameterNumber = 41 ; + typeOfFirstFixedSurface = 1 ; } #Forecast albedo 'Forecast albedo' = { @@ -11436,8 +11462,8 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertically integrated moisture divergence flux -'Vertically integrated moisture divergence flux' = { +#Total column vertically-integrated moisture divergence flux +'Total column vertically-integrated moisture divergence flux' = { discipline = 0 ; parameterCategory = 1 ; parameterNumber = 165 ; diff --git a/definitions/grib2/paramId.def b/definitions/grib2/paramId.def index fcafec803..526405e73 100644 --- a/definitions/grib2/paramId.def +++ b/definitions/grib2/paramId.def @@ -237,7 +237,7 @@ parameterCategory = 3 ; parameterNumber = 0 ; } -#Direct solar radiation +#Surface direct normal short-wave (solar) radiation '47' = { discipline = 0 ; parameterCategory = 4 ; @@ -246,7 +246,7 @@ typeOfSecondFixedSurface = 255 ; typeOfStatisticalProcessing = 1 ; } -#Magnitude of turbulent surface stress +#Time-integrated magnitude of turbulent surface stress '48' = { discipline = 0 ; parameterCategory = 2 ; @@ -284,7 +284,7 @@ parameterCategory = 3 ; parameterNumber = 0 ; } -#Downward UV radiation at the surface +#Surface downward UV radiation '57' = { discipline = 0 ; parameterCategory = 4 ; @@ -463,14 +463,14 @@ parameterCategory = 2 ; parameterNumber = 12 ; } -#Boundary layer dissipation +#Time-integrated boundary layer dissipation '145' = { discipline = 0 ; parameterCategory = 2 ; parameterNumber = 20 ; typeOfStatisticalProcessing = 1 ; } -#Surface sensible heat flux +#Time-integrated surface sensible heat net flux '146' = { discipline = 0 ; parameterCategory = 0 ; @@ -478,7 +478,7 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Surface latent heat flux +#Time-integrated surface latent heat net flux '147' = { discipline = 0 ; parameterCategory = 0 ; @@ -813,7 +813,7 @@ parameterNumber = 63 ; typeOfFirstFixedSurface = 1 ; } -#Instantaneous surface sensible heat flux +#Instantaneous surface sensible heat net flux '231' = { discipline = 0 ; parameterCategory = 0 ; @@ -3052,7 +3052,7 @@ scaledValueOfFirstFixedSurface = 26315 ; scaleFactorOfFirstFixedSurface = 2 ; } -#Total sky direct short-wave (solar) radiation at surface +#Surface direct short-wave (solar) radiation '228021' = { discipline = 0 ; parameterCategory = 4 ; @@ -3427,7 +3427,7 @@ parameterCategory = 0 ; parameterNumber = 33 ; } -#Instantaneous large-scale surface precipitation fraction +#Instantaneous large-scale precipitation fraction '228217' = { discipline = 0 ; parameterCategory = 6 ; @@ -4301,7 +4301,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated divergence of mass flux +#Time-integrated, total column vertically-integrated divergence of mass flux '233014' = { discipline = 0 ; parameterCategory = 3 ; @@ -4310,7 +4310,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated eastward mass flux +#Time-integrated, total column vertically-integrated eastward mass flux '233015' = { discipline = 0 ; parameterCategory = 3 ; @@ -4319,7 +4319,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated northward mass flux +#Time-integrated, total column vertically-integrated northward mass flux '233016' = { discipline = 0 ; parameterCategory = 3 ; @@ -5925,11 +5925,12 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Latent heat net flux +#Surface latent heat net flux '260002' = { discipline = 0 ; parameterCategory = 0 ; parameterNumber = 10 ; + typeOfFirstFixedSurface = 1 ; } #Heat index '260004' = { @@ -6112,6 +6113,7 @@ discipline = 0 ; parameterCategory = 1 ; parameterNumber = 37 ; + typeOfFirstFixedSurface = 1 ; } #Horizontal moisture divergence '260034' = { @@ -6205,12 +6207,14 @@ discipline = 0 ; parameterCategory = 1 ; parameterNumber = 53 ; + typeOfFirstFixedSurface = 1 ; } #Large scale precipitation rate '260050' = { discipline = 0 ; parameterCategory = 1 ; parameterNumber = 54 ; + typeOfFirstFixedSurface = 1 ; } #Total snowfall rate '260053' = { @@ -6253,6 +6257,7 @@ discipline = 0 ; parameterCategory = 1 ; parameterNumber = 67 ; + typeOfFirstFixedSurface = 1 ; } #Ice pellets precipitation rate '260061' = { @@ -6356,17 +6361,19 @@ parameterCategory = 3 ; parameterNumber = 15 ; } -#Zonal flux of gravity wave stress +#Instantaneous eastward gravity wave surface stress '260081' = { discipline = 0 ; parameterCategory = 3 ; parameterNumber = 16 ; + typeOfFirstFixedSurface = 1 ; } -#Meridional flux of gravity wave stress +#Instantaneous northward gravity wave surface stress '260082' = { discipline = 0 ; parameterCategory = 3 ; parameterNumber = 17 ; + typeOfFirstFixedSurface = 1 ; } #5-wave geopotential height anomaly '260084' = { @@ -6380,41 +6387,47 @@ parameterCategory = 4 ; parameterNumber = 1 ; } -#Downward short-wave radiation flux +#Surface downward short-wave radiation flux '260087' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 7 ; + typeOfFirstFixedSurface = 1 ; } -#Upward short-wave radiation flux +#Surface upward short-wave radiation flux '260088' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 8 ; + typeOfFirstFixedSurface = 1 ; } -#Net short wave radiation flux +#Surface net short-wave radiation flux '260089' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 9 ; + typeOfFirstFixedSurface = 1 ; } -#Photosynthetically active radiation +#Surface photosynthetically active radiation flux '260090' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 10 ; + typeOfFirstFixedSurface = 1 ; } -#Net short-wave radiation flux, clear sky +#Surface net short-wave radiation flux, clear sky '260091' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 11 ; + typeOfFirstFixedSurface = 1 ; } -#Downward UV radiation +#Surface downward UV radiation flux '260092' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 12 ; + typeOfFirstFixedSurface = 1 ; } #UV index (under clear sky) '260093' = { @@ -6440,29 +6453,33 @@ parameterCategory = 5 ; parameterNumber = 1 ; } -#Downward long-wave radiation flux +#Surface downward long-wave radiation flux '260097' = { discipline = 0 ; parameterCategory = 5 ; parameterNumber = 3 ; + typeOfFirstFixedSurface = 1 ; } -#Upward long-wave radiation flux +#Surface upward long-wave radiation flux '260098' = { discipline = 0 ; parameterCategory = 5 ; parameterNumber = 4 ; + typeOfFirstFixedSurface = 1 ; } -#Net long wave radiation flux +#Surface net long-wave radiation flux '260099' = { discipline = 0 ; parameterCategory = 5 ; parameterNumber = 5 ; + typeOfFirstFixedSurface = 1 ; } -#Net long-wave radiation flux, clear sky +#Surface net long-wave radiation flux, clear sky '260100' = { discipline = 0 ; parameterCategory = 5 ; parameterNumber = 6 ; + typeOfFirstFixedSurface = 1 ; } #Cloud Ice '260101' = { @@ -6571,6 +6588,7 @@ discipline = 0 ; parameterCategory = 6 ; parameterNumber = 24 ; + typeOfFirstFixedSurface = 1 ; } #Horizontal extent of cumulonimbus (CB) '260120' = { @@ -7272,17 +7290,19 @@ scaledValueOfFirstFixedSurface = 10 ; scaleFactorOfFirstFixedSurface = 0 ; } -#Direct short wave radiation flux +#Surface direct short-wave radiation flux '260262' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 13 ; + typeOfFirstFixedSurface = 1 ; } -#Diffuse short wave radiation flux +#Surface diffuse short-wave radiation flux '260263' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 14 ; + typeOfFirstFixedSurface = 1 ; } #Fraction of snow cover '260289' = { @@ -7380,23 +7400,26 @@ parameterCategory = 3 ; parameterNumber = 18 ; } -#Downward short-wave radiation flux, clear sky +#Surface downward short-wave radiation flux, clear sky '260361' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 52 ; + typeOfFirstFixedSurface = 1 ; } -#Upward short-wave radiation flux, clear sky +#Surface upward short-wave radiation flux, clear sky '260362' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 53 ; + typeOfFirstFixedSurface = 1 ; } -#Downward long-wave radiation flux, clear sky +#Surface downward long-wave radiation flux, clear sky '260363' = { discipline = 0 ; parameterCategory = 5 ; parameterNumber = 8 ; + typeOfFirstFixedSurface = 1 ; } #Soil heat flux '260364' = { @@ -7450,14 +7473,16 @@ discipline = 2 ; parameterCategory = 0 ; parameterNumber = 39 ; + typeOfFirstFixedSurface = 1 ; } #Potential evapotranspiration rate '260436' = { discipline = 2 ; parameterCategory = 0 ; parameterNumber = 40 ; + typeOfFirstFixedSurface = 1 ; } -#Water runoff and drainage rate +#Runoff rate water equivalent (surface plus subsurface) '260443' = { discipline = 2 ; parameterCategory = 0 ; @@ -7468,6 +7493,7 @@ discipline = 2 ; parameterCategory = 0 ; parameterNumber = 41 ; + typeOfFirstFixedSurface = 1 ; } #Forecast albedo '260509' = { @@ -11436,7 +11462,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertically integrated moisture divergence flux +#Total column vertically-integrated moisture divergence flux '162084' = { discipline = 0 ; parameterCategory = 1 ; diff --git a/definitions/grib2/shortName.def b/definitions/grib2/shortName.def index 5ac01bed5..ecaa6ff1f 100644 --- a/definitions/grib2/shortName.def +++ b/definitions/grib2/shortName.def @@ -237,7 +237,7 @@ parameterCategory = 3 ; parameterNumber = 0 ; } -#Direct solar radiation +#Surface direct normal short-wave (solar) radiation 'dsrp' = { discipline = 0 ; parameterCategory = 4 ; @@ -246,7 +246,7 @@ typeOfSecondFixedSurface = 255 ; typeOfStatisticalProcessing = 1 ; } -#Magnitude of turbulent surface stress +#Time-integrated magnitude of turbulent surface stress 'magss' = { discipline = 0 ; parameterCategory = 2 ; @@ -284,7 +284,7 @@ parameterCategory = 3 ; parameterNumber = 0 ; } -#Downward UV radiation at the surface +#Surface downward UV radiation 'uvb' = { discipline = 0 ; parameterCategory = 4 ; @@ -463,14 +463,14 @@ parameterCategory = 2 ; parameterNumber = 12 ; } -#Boundary layer dissipation +#Time-integrated boundary layer dissipation 'bld' = { discipline = 0 ; parameterCategory = 2 ; parameterNumber = 20 ; typeOfStatisticalProcessing = 1 ; } -#Surface sensible heat flux +#Time-integrated surface sensible heat net flux 'sshf' = { discipline = 0 ; parameterCategory = 0 ; @@ -478,7 +478,7 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Surface latent heat flux +#Time-integrated surface latent heat net flux 'slhf' = { discipline = 0 ; parameterCategory = 0 ; @@ -813,7 +813,7 @@ parameterNumber = 63 ; typeOfFirstFixedSurface = 1 ; } -#Instantaneous surface sensible heat flux +#Instantaneous surface sensible heat net flux 'ishf' = { discipline = 0 ; parameterCategory = 0 ; @@ -3052,7 +3052,7 @@ scaledValueOfFirstFixedSurface = 26315 ; scaleFactorOfFirstFixedSurface = 2 ; } -#Total sky direct short-wave (solar) radiation at surface +#Surface direct short-wave (solar) radiation 'fdir' = { discipline = 0 ; parameterCategory = 4 ; @@ -3427,7 +3427,7 @@ parameterCategory = 0 ; parameterNumber = 33 ; } -#Instantaneous large-scale surface precipitation fraction +#Instantaneous large-scale precipitation fraction 'ilspf' = { discipline = 0 ; parameterCategory = 6 ; @@ -4301,8 +4301,8 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated divergence of mass flux -'tvimd' = { +#Time-integrated, total column vertically-integrated divergence of mass flux +'tvimad' = { discipline = 0 ; parameterCategory = 3 ; parameterNumber = 35 ; @@ -4310,8 +4310,8 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated eastward mass flux -'tvime' = { +#Time-integrated, total column vertically-integrated eastward mass flux +'tvimae' = { discipline = 0 ; parameterCategory = 3 ; parameterNumber = 36 ; @@ -4319,8 +4319,8 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated northward mass flux -'tvimn' = { +#Time-integrated, total column vertically-integrated northward mass flux +'tviman' = { discipline = 0 ; parameterCategory = 3 ; parameterNumber = 37 ; @@ -5925,11 +5925,12 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Latent heat net flux -'lhtfl' = { +#Surface latent heat net flux +'slhtf' = { discipline = 0 ; parameterCategory = 0 ; parameterNumber = 10 ; + typeOfFirstFixedSurface = 1 ; } #Heat index 'heatx' = { @@ -6108,10 +6109,11 @@ parameterNumber = 36 ; } #Convective precipitation rate -'cprat' = { +'cpr' = { discipline = 0 ; parameterCategory = 1 ; parameterNumber = 37 ; + typeOfFirstFixedSurface = 1 ; } #Horizontal moisture divergence 'mdiv' = { @@ -6205,12 +6207,14 @@ discipline = 0 ; parameterCategory = 1 ; parameterNumber = 53 ; + typeOfFirstFixedSurface = 1 ; } #Large scale precipitation rate 'lsprate' = { discipline = 0 ; parameterCategory = 1 ; parameterNumber = 54 ; + typeOfFirstFixedSurface = 1 ; } #Total snowfall rate 'tsrate' = { @@ -6253,6 +6257,7 @@ discipline = 0 ; parameterCategory = 1 ; parameterNumber = 67 ; + typeOfFirstFixedSurface = 1 ; } #Ice pellets precipitation rate 'iprate' = { @@ -6356,17 +6361,19 @@ parameterCategory = 3 ; parameterNumber = 15 ; } -#Zonal flux of gravity wave stress -'u-gwd' = { +#Instantaneous eastward gravity wave surface stress +'iegwss' = { discipline = 0 ; parameterCategory = 3 ; parameterNumber = 16 ; + typeOfFirstFixedSurface = 1 ; } -#Meridional flux of gravity wave stress -'v-gwd' = { +#Instantaneous northward gravity wave surface stress +'ingwss' = { discipline = 0 ; parameterCategory = 3 ; parameterNumber = 17 ; + typeOfFirstFixedSurface = 1 ; } #5-wave geopotential height anomaly '5wava' = { @@ -6380,41 +6387,47 @@ parameterCategory = 4 ; parameterNumber = 1 ; } -#Downward short-wave radiation flux -'dswrf' = { +#Surface downward short-wave radiation flux +'sdswrf' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 7 ; + typeOfFirstFixedSurface = 1 ; } -#Upward short-wave radiation flux -'uswrf' = { +#Surface upward short-wave radiation flux +'suswrf' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 8 ; + typeOfFirstFixedSurface = 1 ; } -#Net short wave radiation flux -'nswrf' = { +#Surface net short-wave radiation flux +'snswrf' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 9 ; + typeOfFirstFixedSurface = 1 ; } -#Photosynthetically active radiation -'photar' = { +#Surface photosynthetically active radiation flux +'sparf' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 10 ; + typeOfFirstFixedSurface = 1 ; } -#Net short-wave radiation flux, clear sky -'nswrfcs' = { +#Surface net short-wave radiation flux, clear sky +'snswrfcs' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 11 ; + typeOfFirstFixedSurface = 1 ; } -#Downward UV radiation -'dwuvr' = { +#Surface downward UV radiation flux +'sduvrf' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 12 ; + typeOfFirstFixedSurface = 1 ; } #UV index (under clear sky) 'uviucs' = { @@ -6440,29 +6453,33 @@ parameterCategory = 5 ; parameterNumber = 1 ; } -#Downward long-wave radiation flux -'dlwrf' = { +#Surface downward long-wave radiation flux +'sdlwrf' = { discipline = 0 ; parameterCategory = 5 ; parameterNumber = 3 ; + typeOfFirstFixedSurface = 1 ; } -#Upward long-wave radiation flux -'ulwrf' = { +#Surface upward long-wave radiation flux +'sulwrf' = { discipline = 0 ; parameterCategory = 5 ; parameterNumber = 4 ; + typeOfFirstFixedSurface = 1 ; } -#Net long wave radiation flux -'nlwrf' = { +#Surface net long-wave radiation flux +'snlwrf' = { discipline = 0 ; parameterCategory = 5 ; parameterNumber = 5 ; + typeOfFirstFixedSurface = 1 ; } -#Net long-wave radiation flux, clear sky -'nlwrcs' = { +#Surface net long-wave radiation flux, clear sky +'snlwrcs' = { discipline = 0 ; parameterCategory = 5 ; parameterNumber = 6 ; + typeOfFirstFixedSurface = 1 ; } #Cloud Ice 'cice' = { @@ -6571,6 +6588,7 @@ discipline = 0 ; parameterCategory = 6 ; parameterNumber = 24 ; + typeOfFirstFixedSurface = 1 ; } #Horizontal extent of cumulonimbus (CB) '~' = { @@ -7272,17 +7290,19 @@ scaledValueOfFirstFixedSurface = 10 ; scaleFactorOfFirstFixedSurface = 0 ; } -#Direct short wave radiation flux -'dirswrf' = { +#Surface direct short-wave radiation flux +'sdirswrf' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 13 ; + typeOfFirstFixedSurface = 1 ; } -#Diffuse short wave radiation flux -'difswrf' = { +#Surface diffuse short-wave radiation flux +'sdifswrf' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 14 ; + typeOfFirstFixedSurface = 1 ; } #Fraction of snow cover 'fscov' = { @@ -7380,23 +7400,26 @@ parameterCategory = 3 ; parameterNumber = 18 ; } -#Downward short-wave radiation flux, clear sky -'dswrf_cs' = { +#Surface downward short-wave radiation flux, clear sky +'sdswrfcs' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 52 ; + typeOfFirstFixedSurface = 1 ; } -#Upward short-wave radiation flux, clear sky -'uswrf_cs' = { +#Surface upward short-wave radiation flux, clear sky +'suswrfcs' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 53 ; + typeOfFirstFixedSurface = 1 ; } -#Downward long-wave radiation flux, clear sky -'dlwrf_cs' = { +#Surface downward long-wave radiation flux, clear sky +'sdlwrfcs' = { discipline = 0 ; parameterCategory = 5 ; parameterNumber = 8 ; + typeOfFirstFixedSurface = 1 ; } #Soil heat flux 'sohf' = { @@ -7446,19 +7469,21 @@ typeOfStatisticalProcessing = 1 ; } #Evapotranspiration rate -'et' = { +'etr' = { discipline = 2 ; parameterCategory = 0 ; parameterNumber = 39 ; + typeOfFirstFixedSurface = 1 ; } #Potential evapotranspiration rate -'pet' = { +'petr' = { discipline = 2 ; parameterCategory = 0 ; parameterNumber = 40 ; + typeOfFirstFixedSurface = 1 ; } -#Water runoff and drainage rate -'rod' = { +#Runoff rate water equivalent (surface plus subsurface) +'rorwe' = { discipline = 2 ; parameterCategory = 0 ; parameterNumber = 42 ; @@ -7468,6 +7493,7 @@ discipline = 2 ; parameterCategory = 0 ; parameterNumber = 41 ; + typeOfFirstFixedSurface = 1 ; } #Forecast albedo 'al' = { @@ -11253,7 +11279,7 @@ parameterNumber = 98 ; } #Skin reservoir content -'srcrea' = { +'srcon' = { discipline = 2 ; parameterCategory = 0 ; parameterNumber = 50 ; @@ -11436,8 +11462,8 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertically integrated moisture divergence flux -'viwvd' = { +#Total column vertically-integrated moisture divergence flux +'vimdf' = { discipline = 0 ; parameterCategory = 1 ; parameterNumber = 165 ; diff --git a/definitions/grib2/units.def b/definitions/grib2/units.def index 8ace3232b..091b8b5d3 100644 --- a/definitions/grib2/units.def +++ b/definitions/grib2/units.def @@ -237,7 +237,7 @@ parameterCategory = 3 ; parameterNumber = 0 ; } -#Direct solar radiation +#Surface direct normal short-wave (solar) radiation 'J m**-2' = { discipline = 0 ; parameterCategory = 4 ; @@ -246,7 +246,7 @@ typeOfSecondFixedSurface = 255 ; typeOfStatisticalProcessing = 1 ; } -#Magnitude of turbulent surface stress +#Time-integrated magnitude of turbulent surface stress 'N m**-2 s' = { discipline = 0 ; parameterCategory = 2 ; @@ -284,7 +284,7 @@ parameterCategory = 3 ; parameterNumber = 0 ; } -#Downward UV radiation at the surface +#Surface downward UV radiation 'J m**-2' = { discipline = 0 ; parameterCategory = 4 ; @@ -463,14 +463,14 @@ parameterCategory = 2 ; parameterNumber = 12 ; } -#Boundary layer dissipation +#Time-integrated boundary layer dissipation 'J m**-2' = { discipline = 0 ; parameterCategory = 2 ; parameterNumber = 20 ; typeOfStatisticalProcessing = 1 ; } -#Surface sensible heat flux +#Time-integrated surface sensible heat net flux 'J m**-2' = { discipline = 0 ; parameterCategory = 0 ; @@ -478,7 +478,7 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Surface latent heat flux +#Time-integrated surface latent heat net flux 'J m**-2' = { discipline = 0 ; parameterCategory = 0 ; @@ -813,7 +813,7 @@ parameterNumber = 63 ; typeOfFirstFixedSurface = 1 ; } -#Instantaneous surface sensible heat flux +#Instantaneous surface sensible heat net flux 'W m**-2' = { discipline = 0 ; parameterCategory = 0 ; @@ -3052,7 +3052,7 @@ scaledValueOfFirstFixedSurface = 26315 ; scaleFactorOfFirstFixedSurface = 2 ; } -#Total sky direct short-wave (solar) radiation at surface +#Surface direct short-wave (solar) radiation 'J m**-2' = { discipline = 0 ; parameterCategory = 4 ; @@ -3427,8 +3427,8 @@ parameterCategory = 0 ; parameterNumber = 33 ; } -#Instantaneous large-scale surface precipitation fraction -'(0 - 1)' = { +#Instantaneous large-scale precipitation fraction +'Proportion' = { discipline = 0 ; parameterCategory = 6 ; parameterNumber = 36 ; @@ -4301,7 +4301,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated divergence of mass flux +#Time-integrated, total column vertically-integrated divergence of mass flux 'kg m**-2' = { discipline = 0 ; parameterCategory = 3 ; @@ -4310,7 +4310,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated eastward mass flux +#Time-integrated, total column vertically-integrated eastward mass flux 'kg m**-1' = { discipline = 0 ; parameterCategory = 3 ; @@ -4319,7 +4319,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated northward mass flux +#Time-integrated, total column vertically-integrated northward mass flux 'kg m**-1' = { discipline = 0 ; parameterCategory = 3 ; @@ -5925,11 +5925,12 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Latent heat net flux +#Surface latent heat net flux 'W m**-2' = { discipline = 0 ; parameterCategory = 0 ; parameterNumber = 10 ; + typeOfFirstFixedSurface = 1 ; } #Heat index 'K' = { @@ -6112,6 +6113,7 @@ discipline = 0 ; parameterCategory = 1 ; parameterNumber = 37 ; + typeOfFirstFixedSurface = 1 ; } #Horizontal moisture divergence 'kg kg**-1 s**-1' = { @@ -6205,12 +6207,14 @@ discipline = 0 ; parameterCategory = 1 ; parameterNumber = 53 ; + typeOfFirstFixedSurface = 1 ; } #Large scale precipitation rate 'kg m**-2 s**-1' = { discipline = 0 ; parameterCategory = 1 ; parameterNumber = 54 ; + typeOfFirstFixedSurface = 1 ; } #Total snowfall rate 'm s**-1' = { @@ -6253,6 +6257,7 @@ discipline = 0 ; parameterCategory = 1 ; parameterNumber = 67 ; + typeOfFirstFixedSurface = 1 ; } #Ice pellets precipitation rate 'kg m**-2 s**-1' = { @@ -6356,17 +6361,19 @@ parameterCategory = 3 ; parameterNumber = 15 ; } -#Zonal flux of gravity wave stress +#Instantaneous eastward gravity wave surface stress 'N m**-2' = { discipline = 0 ; parameterCategory = 3 ; parameterNumber = 16 ; + typeOfFirstFixedSurface = 1 ; } -#Meridional flux of gravity wave stress +#Instantaneous northward gravity wave surface stress 'N m**-2' = { discipline = 0 ; parameterCategory = 3 ; parameterNumber = 17 ; + typeOfFirstFixedSurface = 1 ; } #5-wave geopotential height anomaly 'gpm' = { @@ -6380,41 +6387,47 @@ parameterCategory = 4 ; parameterNumber = 1 ; } -#Downward short-wave radiation flux +#Surface downward short-wave radiation flux 'W m**-2' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 7 ; + typeOfFirstFixedSurface = 1 ; } -#Upward short-wave radiation flux +#Surface upward short-wave radiation flux 'W m**-2' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 8 ; + typeOfFirstFixedSurface = 1 ; } -#Net short wave radiation flux +#Surface net short-wave radiation flux 'W m**-2' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 9 ; + typeOfFirstFixedSurface = 1 ; } -#Photosynthetically active radiation +#Surface photosynthetically active radiation flux 'W m**-2' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 10 ; + typeOfFirstFixedSurface = 1 ; } -#Net short-wave radiation flux, clear sky +#Surface net short-wave radiation flux, clear sky 'W m**-2' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 11 ; + typeOfFirstFixedSurface = 1 ; } -#Downward UV radiation +#Surface downward UV radiation flux 'W m**-2' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 12 ; + typeOfFirstFixedSurface = 1 ; } #UV index (under clear sky) 'Numeric' = { @@ -6440,29 +6453,33 @@ parameterCategory = 5 ; parameterNumber = 1 ; } -#Downward long-wave radiation flux +#Surface downward long-wave radiation flux 'W m**-2' = { discipline = 0 ; parameterCategory = 5 ; parameterNumber = 3 ; + typeOfFirstFixedSurface = 1 ; } -#Upward long-wave radiation flux +#Surface upward long-wave radiation flux 'W m**-2' = { discipline = 0 ; parameterCategory = 5 ; parameterNumber = 4 ; + typeOfFirstFixedSurface = 1 ; } -#Net long wave radiation flux +#Surface net long-wave radiation flux 'W m**-2' = { discipline = 0 ; parameterCategory = 5 ; parameterNumber = 5 ; + typeOfFirstFixedSurface = 1 ; } -#Net long-wave radiation flux, clear sky +#Surface net long-wave radiation flux, clear sky 'W m**-2' = { discipline = 0 ; parameterCategory = 5 ; parameterNumber = 6 ; + typeOfFirstFixedSurface = 1 ; } #Cloud Ice 'kg m**-2' = { @@ -6571,6 +6588,7 @@ discipline = 0 ; parameterCategory = 6 ; parameterNumber = 24 ; + typeOfFirstFixedSurface = 1 ; } #Horizontal extent of cumulonimbus (CB) '%' = { @@ -7272,17 +7290,19 @@ scaledValueOfFirstFixedSurface = 10 ; scaleFactorOfFirstFixedSurface = 0 ; } -#Direct short wave radiation flux +#Surface direct short-wave radiation flux 'W m**-2' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 13 ; + typeOfFirstFixedSurface = 1 ; } -#Diffuse short wave radiation flux +#Surface diffuse short-wave radiation flux 'W m**-2' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 14 ; + typeOfFirstFixedSurface = 1 ; } #Fraction of snow cover 'Proportion' = { @@ -7380,23 +7400,26 @@ parameterCategory = 3 ; parameterNumber = 18 ; } -#Downward short-wave radiation flux, clear sky +#Surface downward short-wave radiation flux, clear sky 'W m**-2' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 52 ; + typeOfFirstFixedSurface = 1 ; } -#Upward short-wave radiation flux, clear sky +#Surface upward short-wave radiation flux, clear sky 'W m**-2' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 53 ; + typeOfFirstFixedSurface = 1 ; } -#Downward long-wave radiation flux, clear sky +#Surface downward long-wave radiation flux, clear sky 'W m**-2' = { discipline = 0 ; parameterCategory = 5 ; parameterNumber = 8 ; + typeOfFirstFixedSurface = 1 ; } #Soil heat flux 'W m**-2' = { @@ -7450,14 +7473,16 @@ discipline = 2 ; parameterCategory = 0 ; parameterNumber = 39 ; + typeOfFirstFixedSurface = 1 ; } #Potential evapotranspiration rate 'kg m**-2 s**-1' = { discipline = 2 ; parameterCategory = 0 ; parameterNumber = 40 ; + typeOfFirstFixedSurface = 1 ; } -#Water runoff and drainage rate +#Runoff rate water equivalent (surface plus subsurface) 'kg m**-2 s**-1' = { discipline = 2 ; parameterCategory = 0 ; @@ -7468,6 +7493,7 @@ discipline = 2 ; parameterCategory = 0 ; parameterNumber = 41 ; + typeOfFirstFixedSurface = 1 ; } #Forecast albedo '%' = { @@ -11436,7 +11462,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertically integrated moisture divergence flux +#Total column vertically-integrated moisture divergence flux 'kg m**-2 s**-1' = { discipline = 0 ; parameterCategory = 1 ; From fcc21c05c8d2b9bbcaec18217a32216f19940df3 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Tue, 13 Aug 2024 13:13:07 +0000 Subject: [PATCH 11/27] ECC-1880: GRIB2: Additions & modifications of instantaneous parameters for generalised time processing approach (part 4) --- definitions/grib1/localConcepts/ecmf/name.def | 140 ++++++++-------- .../grib1/localConcepts/ecmf/paramId.def | 70 ++++---- .../grib1/localConcepts/ecmf/shortName.def | 70 ++++---- .../grib1/localConcepts/ecmf/units.def | 70 ++++---- definitions/grib1/localConcepts/rjtd/name.def | 16 +- .../grib1/localConcepts/rjtd/paramId.def | 8 +- .../grib1/localConcepts/rjtd/shortName.def | 8 +- .../grib1/localConcepts/rjtd/units.def | 8 +- definitions/grib2/cfVarName.def | 20 +++ definitions/grib2/localConcepts/era/name.def | 84 +++++----- .../grib2/localConcepts/era/paramId.def | 42 ++--- .../grib2/localConcepts/era/shortName.def | 42 ++--- definitions/grib2/localConcepts/era/units.def | 42 ++--- definitions/grib2/localConcepts/era6/name.def | 16 +- .../grib2/localConcepts/era6/paramId.def | 8 +- .../grib2/localConcepts/era6/shortName.def | 8 +- .../grib2/localConcepts/era6/units.def | 8 +- definitions/grib2/name.def | 156 +++++++++--------- definitions/grib2/paramId.def | 78 ++++----- definitions/grib2/shortName.def | 78 ++++----- definitions/grib2/units.def | 78 ++++----- 21 files changed, 535 insertions(+), 515 deletions(-) diff --git a/definitions/grib1/localConcepts/ecmf/name.def b/definitions/grib1/localConcepts/ecmf/name.def index 403b30e84..eb319acb5 100644 --- a/definitions/grib1/localConcepts/ecmf/name.def +++ b/definitions/grib1/localConcepts/ecmf/name.def @@ -3584,38 +3584,38 @@ table2Version = 162 ; indicatorOfParameter = 45 ; } -#Vertical integral of divergence of cloud liquid water flux -'Vertical integral of divergence of cloud liquid water flux' = { +#Total column vertically-integrated divergence of cloud liquid water flux +'Total column vertically-integrated divergence of cloud liquid water flux' = { table2Version = 162 ; indicatorOfParameter = 79 ; } -#Vertical integral of divergence of cloud frozen water flux -'Vertical integral of divergence of cloud frozen water flux' = { +#Total column vertically-integrated divergence of cloud frozen water flux +'Total column vertically-integrated divergence of cloud frozen water flux' = { table2Version = 162 ; indicatorOfParameter = 80 ; } -#Vertical integral of eastward cloud liquid water flux -'Vertical integral of eastward cloud liquid water flux' = { +#Total column vertically-integrated eastward cloud liquid water flux +'Total column vertically-integrated eastward cloud liquid water flux' = { table2Version = 162 ; indicatorOfParameter = 88 ; } -#Vertical integral of northward cloud liquid water flux -'Vertical integral of northward cloud liquid water flux' = { +#Total column vertically-integrated northward cloud liquid water flux +'Total column vertically-integrated northward cloud liquid water flux' = { table2Version = 162 ; indicatorOfParameter = 89 ; } -#Vertical integral of eastward cloud frozen water flux -'Vertical integral of eastward cloud frozen water flux' = { +#Total column vertically-integrated eastward cloud frozen water flux +'Total column vertically-integrated eastward cloud frozen water flux' = { table2Version = 162 ; indicatorOfParameter = 90 ; } -#Vertical integral of northward cloud frozen water flux -'Vertical integral of northward cloud frozen water flux ' = { +#Total column vertically-integrated northward cloud frozen water flux +'Total column vertically-integrated northward cloud frozen water flux ' = { table2Version = 162 ; indicatorOfParameter = 91 ; } -#Vertical integral of mass tendency -'Vertical integral of mass tendency' = { +#Total column vertically-integrated mass tendency +'Total column vertically-integrated mass tendency' = { table2Version = 162 ; indicatorOfParameter = 92 ; } @@ -13669,33 +13669,33 @@ table2Version = 162 ; indicatorOfParameter = 51 ; } -#Vertical integral of mass of atmosphere -'Vertical integral of mass of atmosphere' = { +#Total column vertically-integrated mass of atmosphere +'Total column vertically-integrated mass of atmosphere' = { table2Version = 162 ; indicatorOfParameter = 53 ; } -#Vertical integral of temperature -'Vertical integral of temperature' = { +#Total column vertically-integrated temperature +'Total column vertically-integrated temperature' = { table2Version = 162 ; indicatorOfParameter = 54 ; } -#Vertical integral of water vapour -'Vertical integral of water vapour' = { +#Total column vertically-integrated water vapour +'Total column vertically-integrated water vapour' = { table2Version = 162 ; indicatorOfParameter = 55 ; } -#Vertical integral of cloud liquid water -'Vertical integral of cloud liquid water' = { +#Total column vertically-integrated cloud liquid water +'Total column vertically-integrated cloud liquid water' = { table2Version = 162 ; indicatorOfParameter = 56 ; } -#Vertical integral of cloud frozen water -'Vertical integral of cloud frozen water' = { +#Total column vertically-integrated cloud frozen water +'Total column vertically-integrated cloud frozen water' = { table2Version = 162 ; indicatorOfParameter = 57 ; } -#Vertical integral of ozone -'Vertical integral of ozone' = { +#Total column vertically-integrated ozone +'Total column vertically-integrated ozone' = { table2Version = 162 ; indicatorOfParameter = 58 ; } @@ -13714,8 +13714,8 @@ table2Version = 162 ; indicatorOfParameter = 61 ; } -#Vertical integral of potential+internal+latent energy -'Vertical integral of potential+internal+latent energy' = { +#Total column vertically-integrated potential+internal+latent energy +'Total column vertically-integrated potential+internal+latent energy' = { table2Version = 162 ; indicatorOfParameter = 62 ; } @@ -13724,93 +13724,93 @@ table2Version = 162 ; indicatorOfParameter = 63 ; } -#Vertical integral of energy conversion -'Vertical integral of energy conversion' = { +#Total column vertically-integrated energy conversion +'Total column vertically-integrated energy conversion' = { table2Version = 162 ; indicatorOfParameter = 64 ; } -#Vertical integral of eastward mass flux -'Vertical integral of eastward mass flux' = { +#Total column vertically-integrated eastward mass flux +'Total column vertically-integrated eastward mass flux' = { table2Version = 162 ; indicatorOfParameter = 65 ; } -#Vertical integral of northward mass flux -'Vertical integral of northward mass flux' = { +#Total column vertically-integrated northward mass flux +'Total column vertically-integrated northward mass flux' = { table2Version = 162 ; indicatorOfParameter = 66 ; } -#Vertical integral of eastward kinetic energy flux -'Vertical integral of eastward kinetic energy flux' = { +#Total column vertically-integrated eastward kinetic energy flux +'Total column vertically-integrated eastward kinetic energy flux' = { table2Version = 162 ; indicatorOfParameter = 67 ; } -#Vertical integral of northward kinetic energy flux -'Vertical integral of northward kinetic energy flux' = { +#Total column vertically-integrated northward kinetic energy flux +'Total column vertically-integrated northward kinetic energy flux' = { table2Version = 162 ; indicatorOfParameter = 68 ; } -#Vertical integral of eastward heat flux -'Vertical integral of eastward heat flux' = { +#Total column vertically-integrated eastward heat flux +'Total column vertically-integrated eastward heat flux' = { table2Version = 162 ; indicatorOfParameter = 69 ; } -#Vertical integral of northward heat flux -'Vertical integral of northward heat flux' = { +#Total column vertically-integrated northward heat flux +'Total column vertically-integrated northward heat flux' = { table2Version = 162 ; indicatorOfParameter = 70 ; } -#Vertical integral of eastward water vapour flux -'Vertical integral of eastward water vapour flux' = { +#Total column vertically-integrated eastward water vapour flux +'Total column vertically-integrated eastward water vapour flux' = { table2Version = 162 ; indicatorOfParameter = 71 ; } -#Vertical integral of northward water vapour flux -'Vertical integral of northward water vapour flux' = { +#Total column vertically-integrated northward water vapour flux +'Total column vertically-integrated northward water vapour flux' = { table2Version = 162 ; indicatorOfParameter = 72 ; } -#Vertical integral of eastward geopotential flux -'Vertical integral of eastward geopotential flux' = { +#Total column vertically-integrated eastward geopotential flux +'Total column vertically-integrated eastward geopotential flux' = { table2Version = 162 ; indicatorOfParameter = 73 ; } -#Vertical integral of northward geopotential flux -'Vertical integral of northward geopotential flux' = { +#Total column vertically-integrated northward geopotential flux +'Total column vertically-integrated northward geopotential flux' = { table2Version = 162 ; indicatorOfParameter = 74 ; } -#Vertical integral of eastward total energy flux -'Vertical integral of eastward total energy flux' = { +#Total column vertically-integrated eastward total energy flux +'Total column vertically-integrated eastward total energy flux' = { table2Version = 162 ; indicatorOfParameter = 75 ; } -#Vertical integral of northward total energy flux -'Vertical integral of northward total energy flux' = { +#Total column vertically-integrated northward total energy flux +'Total column vertically-integrated northward total energy flux' = { table2Version = 162 ; indicatorOfParameter = 76 ; } -#Vertical integral of eastward ozone flux -'Vertical integral of eastward ozone flux' = { +#Total column vertically-integrated eastward ozone flux +'Total column vertically-integrated eastward ozone flux' = { table2Version = 162 ; indicatorOfParameter = 77 ; } -#Vertical integral of northward ozone flux -'Vertical integral of northward ozone flux' = { +#Total column vertically-integrated northward ozone flux +'Total column vertically-integrated northward ozone flux' = { table2Version = 162 ; indicatorOfParameter = 78 ; } -#Vertical integral of divergence of mass flux -'Vertical integral of divergence of mass flux' = { +#Total column vertically-integrated divergence of mass flux +'Total column vertically-integrated divergence of mass flux' = { table2Version = 162 ; indicatorOfParameter = 81 ; } -#Vertical integral of divergence of kinetic energy flux -'Vertical integral of divergence of kinetic energy flux' = { +#Total column vertically-integrated divergence of kinetic energy flux +'Total column vertically-integrated divergence of kinetic energy flux' = { table2Version = 162 ; indicatorOfParameter = 82 ; } -#Vertical integral of divergence of thermal energy flux -'Vertical integral of divergence of thermal energy flux' = { +#Total column vertically-integrated divergence of thermal energy flux +'Total column vertically-integrated divergence of thermal energy flux' = { table2Version = 162 ; indicatorOfParameter = 83 ; } @@ -13819,18 +13819,18 @@ table2Version = 162 ; indicatorOfParameter = 84 ; } -#Vertical integral of divergence of geopotential flux -'Vertical integral of divergence of geopotential flux' = { +#Total column vertically-integrated divergence of geopotential flux +'Total column vertically-integrated divergence of geopotential flux' = { table2Version = 162 ; indicatorOfParameter = 85 ; } -#Vertical integral of divergence of total energy flux -'Vertical integral of divergence of total energy flux' = { +#Total column vertically-integrated divergence of total energy flux +'Total column vertically-integrated divergence of total energy flux' = { table2Version = 162 ; indicatorOfParameter = 86 ; } -#Vertical integral of divergence of ozone flux -'Vertical integral of divergence of ozone flux' = { +#Total column vertically-integrated divergence of ozone flux +'Total column vertically-integrated divergence of ozone flux' = { table2Version = 162 ; indicatorOfParameter = 87 ; } diff --git a/definitions/grib1/localConcepts/ecmf/paramId.def b/definitions/grib1/localConcepts/ecmf/paramId.def index e89a9a96a..6301ec4ff 100644 --- a/definitions/grib1/localConcepts/ecmf/paramId.def +++ b/definitions/grib1/localConcepts/ecmf/paramId.def @@ -3584,37 +3584,37 @@ table2Version = 162 ; indicatorOfParameter = 45 ; } -#Vertical integral of divergence of cloud liquid water flux +#Total column vertically-integrated divergence of cloud liquid water flux '162079' = { table2Version = 162 ; indicatorOfParameter = 79 ; } -#Vertical integral of divergence of cloud frozen water flux +#Total column vertically-integrated divergence of cloud frozen water flux '162080' = { table2Version = 162 ; indicatorOfParameter = 80 ; } -#Vertical integral of eastward cloud liquid water flux +#Total column vertically-integrated eastward cloud liquid water flux '162088' = { table2Version = 162 ; indicatorOfParameter = 88 ; } -#Vertical integral of northward cloud liquid water flux +#Total column vertically-integrated northward cloud liquid water flux '162089' = { table2Version = 162 ; indicatorOfParameter = 89 ; } -#Vertical integral of eastward cloud frozen water flux +#Total column vertically-integrated eastward cloud frozen water flux '162090' = { table2Version = 162 ; indicatorOfParameter = 90 ; } -#Vertical integral of northward cloud frozen water flux +#Total column vertically-integrated northward cloud frozen water flux '162091' = { table2Version = 162 ; indicatorOfParameter = 91 ; } -#Vertical integral of mass tendency +#Total column vertically-integrated mass tendency '162092' = { table2Version = 162 ; indicatorOfParameter = 92 ; @@ -13669,32 +13669,32 @@ table2Version = 162 ; indicatorOfParameter = 51 ; } -#Vertical integral of mass of atmosphere +#Total column vertically-integrated mass of atmosphere '162053' = { table2Version = 162 ; indicatorOfParameter = 53 ; } -#Vertical integral of temperature +#Total column vertically-integrated temperature '162054' = { table2Version = 162 ; indicatorOfParameter = 54 ; } -#Vertical integral of water vapour +#Total column vertically-integrated water vapour '162055' = { table2Version = 162 ; indicatorOfParameter = 55 ; } -#Vertical integral of cloud liquid water +#Total column vertically-integrated cloud liquid water '162056' = { table2Version = 162 ; indicatorOfParameter = 56 ; } -#Vertical integral of cloud frozen water +#Total column vertically-integrated cloud frozen water '162057' = { table2Version = 162 ; indicatorOfParameter = 57 ; } -#Vertical integral of ozone +#Total column vertically-integrated ozone '162058' = { table2Version = 162 ; indicatorOfParameter = 58 ; @@ -13714,7 +13714,7 @@ table2Version = 162 ; indicatorOfParameter = 61 ; } -#Vertical integral of potential+internal+latent energy +#Total column vertically-integrated potential+internal+latent energy '162062' = { table2Version = 162 ; indicatorOfParameter = 62 ; @@ -13724,92 +13724,92 @@ table2Version = 162 ; indicatorOfParameter = 63 ; } -#Vertical integral of energy conversion +#Total column vertically-integrated energy conversion '162064' = { table2Version = 162 ; indicatorOfParameter = 64 ; } -#Vertical integral of eastward mass flux +#Total column vertically-integrated eastward mass flux '162065' = { table2Version = 162 ; indicatorOfParameter = 65 ; } -#Vertical integral of northward mass flux +#Total column vertically-integrated northward mass flux '162066' = { table2Version = 162 ; indicatorOfParameter = 66 ; } -#Vertical integral of eastward kinetic energy flux +#Total column vertically-integrated eastward kinetic energy flux '162067' = { table2Version = 162 ; indicatorOfParameter = 67 ; } -#Vertical integral of northward kinetic energy flux +#Total column vertically-integrated northward kinetic energy flux '162068' = { table2Version = 162 ; indicatorOfParameter = 68 ; } -#Vertical integral of eastward heat flux +#Total column vertically-integrated eastward heat flux '162069' = { table2Version = 162 ; indicatorOfParameter = 69 ; } -#Vertical integral of northward heat flux +#Total column vertically-integrated northward heat flux '162070' = { table2Version = 162 ; indicatorOfParameter = 70 ; } -#Vertical integral of eastward water vapour flux +#Total column vertically-integrated eastward water vapour flux '162071' = { table2Version = 162 ; indicatorOfParameter = 71 ; } -#Vertical integral of northward water vapour flux +#Total column vertically-integrated northward water vapour flux '162072' = { table2Version = 162 ; indicatorOfParameter = 72 ; } -#Vertical integral of eastward geopotential flux +#Total column vertically-integrated eastward geopotential flux '162073' = { table2Version = 162 ; indicatorOfParameter = 73 ; } -#Vertical integral of northward geopotential flux +#Total column vertically-integrated northward geopotential flux '162074' = { table2Version = 162 ; indicatorOfParameter = 74 ; } -#Vertical integral of eastward total energy flux +#Total column vertically-integrated eastward total energy flux '162075' = { table2Version = 162 ; indicatorOfParameter = 75 ; } -#Vertical integral of northward total energy flux +#Total column vertically-integrated northward total energy flux '162076' = { table2Version = 162 ; indicatorOfParameter = 76 ; } -#Vertical integral of eastward ozone flux +#Total column vertically-integrated eastward ozone flux '162077' = { table2Version = 162 ; indicatorOfParameter = 77 ; } -#Vertical integral of northward ozone flux +#Total column vertically-integrated northward ozone flux '162078' = { table2Version = 162 ; indicatorOfParameter = 78 ; } -#Vertical integral of divergence of mass flux +#Total column vertically-integrated divergence of mass flux '162081' = { table2Version = 162 ; indicatorOfParameter = 81 ; } -#Vertical integral of divergence of kinetic energy flux +#Total column vertically-integrated divergence of kinetic energy flux '162082' = { table2Version = 162 ; indicatorOfParameter = 82 ; } -#Vertical integral of divergence of thermal energy flux +#Total column vertically-integrated divergence of thermal energy flux '162083' = { table2Version = 162 ; indicatorOfParameter = 83 ; @@ -13819,17 +13819,17 @@ table2Version = 162 ; indicatorOfParameter = 84 ; } -#Vertical integral of divergence of geopotential flux +#Total column vertically-integrated divergence of geopotential flux '162085' = { table2Version = 162 ; indicatorOfParameter = 85 ; } -#Vertical integral of divergence of total energy flux +#Total column vertically-integrated divergence of total energy flux '162086' = { table2Version = 162 ; indicatorOfParameter = 86 ; } -#Vertical integral of divergence of ozone flux +#Total column vertically-integrated divergence of ozone flux '162087' = { table2Version = 162 ; indicatorOfParameter = 87 ; diff --git a/definitions/grib1/localConcepts/ecmf/shortName.def b/definitions/grib1/localConcepts/ecmf/shortName.def index c3429bc9d..c7fde21ea 100644 --- a/definitions/grib1/localConcepts/ecmf/shortName.def +++ b/definitions/grib1/localConcepts/ecmf/shortName.def @@ -3584,37 +3584,37 @@ table2Version = 162 ; indicatorOfParameter = 45 ; } -#Vertical integral of divergence of cloud liquid water flux +#Total column vertically-integrated divergence of cloud liquid water flux 'vilwd' = { table2Version = 162 ; indicatorOfParameter = 79 ; } -#Vertical integral of divergence of cloud frozen water flux +#Total column vertically-integrated divergence of cloud frozen water flux 'viiwd' = { table2Version = 162 ; indicatorOfParameter = 80 ; } -#Vertical integral of eastward cloud liquid water flux +#Total column vertically-integrated eastward cloud liquid water flux 'vilwe' = { table2Version = 162 ; indicatorOfParameter = 88 ; } -#Vertical integral of northward cloud liquid water flux +#Total column vertically-integrated northward cloud liquid water flux 'vilwn' = { table2Version = 162 ; indicatorOfParameter = 89 ; } -#Vertical integral of eastward cloud frozen water flux +#Total column vertically-integrated eastward cloud frozen water flux 'viiwe' = { table2Version = 162 ; indicatorOfParameter = 90 ; } -#Vertical integral of northward cloud frozen water flux +#Total column vertically-integrated northward cloud frozen water flux 'viiwn' = { table2Version = 162 ; indicatorOfParameter = 91 ; } -#Vertical integral of mass tendency +#Total column vertically-integrated mass tendency 'vimat' = { table2Version = 162 ; indicatorOfParameter = 92 ; @@ -13669,32 +13669,32 @@ table2Version = 162 ; indicatorOfParameter = 51 ; } -#Vertical integral of mass of atmosphere +#Total column vertically-integrated mass of atmosphere 'vima' = { table2Version = 162 ; indicatorOfParameter = 53 ; } -#Vertical integral of temperature +#Total column vertically-integrated temperature 'vit' = { table2Version = 162 ; indicatorOfParameter = 54 ; } -#Vertical integral of water vapour +#Total column vertically-integrated water vapour 'viwv' = { table2Version = 162 ; indicatorOfParameter = 55 ; } -#Vertical integral of cloud liquid water +#Total column vertically-integrated cloud liquid water 'vilw' = { table2Version = 162 ; indicatorOfParameter = 56 ; } -#Vertical integral of cloud frozen water +#Total column vertically-integrated cloud frozen water 'viiw' = { table2Version = 162 ; indicatorOfParameter = 57 ; } -#Vertical integral of ozone +#Total column vertically-integrated ozone 'vioz' = { table2Version = 162 ; indicatorOfParameter = 58 ; @@ -13714,7 +13714,7 @@ table2Version = 162 ; indicatorOfParameter = 61 ; } -#Vertical integral of potential+internal+latent energy +#Total column vertically-integrated potential+internal+latent energy 'vipile' = { table2Version = 162 ; indicatorOfParameter = 62 ; @@ -13724,92 +13724,92 @@ table2Version = 162 ; indicatorOfParameter = 63 ; } -#Vertical integral of energy conversion +#Total column vertically-integrated energy conversion 'viec' = { table2Version = 162 ; indicatorOfParameter = 64 ; } -#Vertical integral of eastward mass flux +#Total column vertically-integrated eastward mass flux 'vimae' = { table2Version = 162 ; indicatorOfParameter = 65 ; } -#Vertical integral of northward mass flux +#Total column vertically-integrated northward mass flux 'viman' = { table2Version = 162 ; indicatorOfParameter = 66 ; } -#Vertical integral of eastward kinetic energy flux +#Total column vertically-integrated eastward kinetic energy flux 'vikee' = { table2Version = 162 ; indicatorOfParameter = 67 ; } -#Vertical integral of northward kinetic energy flux +#Total column vertically-integrated northward kinetic energy flux 'viken' = { table2Version = 162 ; indicatorOfParameter = 68 ; } -#Vertical integral of eastward heat flux +#Total column vertically-integrated eastward heat flux 'vithee' = { table2Version = 162 ; indicatorOfParameter = 69 ; } -#Vertical integral of northward heat flux +#Total column vertically-integrated northward heat flux 'vithen' = { table2Version = 162 ; indicatorOfParameter = 70 ; } -#Vertical integral of eastward water vapour flux +#Total column vertically-integrated eastward water vapour flux 'viwve' = { table2Version = 162 ; indicatorOfParameter = 71 ; } -#Vertical integral of northward water vapour flux +#Total column vertically-integrated northward water vapour flux 'viwvn' = { table2Version = 162 ; indicatorOfParameter = 72 ; } -#Vertical integral of eastward geopotential flux +#Total column vertically-integrated eastward geopotential flux 'vige' = { table2Version = 162 ; indicatorOfParameter = 73 ; } -#Vertical integral of northward geopotential flux +#Total column vertically-integrated northward geopotential flux 'vign' = { table2Version = 162 ; indicatorOfParameter = 74 ; } -#Vertical integral of eastward total energy flux +#Total column vertically-integrated eastward total energy flux 'vitee' = { table2Version = 162 ; indicatorOfParameter = 75 ; } -#Vertical integral of northward total energy flux +#Total column vertically-integrated northward total energy flux 'viten' = { table2Version = 162 ; indicatorOfParameter = 76 ; } -#Vertical integral of eastward ozone flux +#Total column vertically-integrated eastward ozone flux 'vioze' = { table2Version = 162 ; indicatorOfParameter = 77 ; } -#Vertical integral of northward ozone flux +#Total column vertically-integrated northward ozone flux 'viozn' = { table2Version = 162 ; indicatorOfParameter = 78 ; } -#Vertical integral of divergence of mass flux +#Total column vertically-integrated divergence of mass flux 'vimad' = { table2Version = 162 ; indicatorOfParameter = 81 ; } -#Vertical integral of divergence of kinetic energy flux +#Total column vertically-integrated divergence of kinetic energy flux 'viked' = { table2Version = 162 ; indicatorOfParameter = 82 ; } -#Vertical integral of divergence of thermal energy flux +#Total column vertically-integrated divergence of thermal energy flux 'vithed' = { table2Version = 162 ; indicatorOfParameter = 83 ; @@ -13819,17 +13819,17 @@ table2Version = 162 ; indicatorOfParameter = 84 ; } -#Vertical integral of divergence of geopotential flux +#Total column vertically-integrated divergence of geopotential flux 'vigd' = { table2Version = 162 ; indicatorOfParameter = 85 ; } -#Vertical integral of divergence of total energy flux +#Total column vertically-integrated divergence of total energy flux 'vited' = { table2Version = 162 ; indicatorOfParameter = 86 ; } -#Vertical integral of divergence of ozone flux +#Total column vertically-integrated divergence of ozone flux 'viozd' = { table2Version = 162 ; indicatorOfParameter = 87 ; diff --git a/definitions/grib1/localConcepts/ecmf/units.def b/definitions/grib1/localConcepts/ecmf/units.def index 0217a43b1..ae33fd2ee 100644 --- a/definitions/grib1/localConcepts/ecmf/units.def +++ b/definitions/grib1/localConcepts/ecmf/units.def @@ -3584,37 +3584,37 @@ table2Version = 162 ; indicatorOfParameter = 45 ; } -#Vertical integral of divergence of cloud liquid water flux +#Total column vertically-integrated divergence of cloud liquid water flux 'kg m**-2 s**-1' = { table2Version = 162 ; indicatorOfParameter = 79 ; } -#Vertical integral of divergence of cloud frozen water flux +#Total column vertically-integrated divergence of cloud frozen water flux 'kg m**-2 s**-1' = { table2Version = 162 ; indicatorOfParameter = 80 ; } -#Vertical integral of eastward cloud liquid water flux +#Total column vertically-integrated eastward cloud liquid water flux 'kg m**-1 s**-1' = { table2Version = 162 ; indicatorOfParameter = 88 ; } -#Vertical integral of northward cloud liquid water flux +#Total column vertically-integrated northward cloud liquid water flux 'kg m**-1 s**-1' = { table2Version = 162 ; indicatorOfParameter = 89 ; } -#Vertical integral of eastward cloud frozen water flux +#Total column vertically-integrated eastward cloud frozen water flux 'kg m**-1 s**-1' = { table2Version = 162 ; indicatorOfParameter = 90 ; } -#Vertical integral of northward cloud frozen water flux +#Total column vertically-integrated northward cloud frozen water flux 'kg m**-1 s**-1' = { table2Version = 162 ; indicatorOfParameter = 91 ; } -#Vertical integral of mass tendency +#Total column vertically-integrated mass tendency 'kg m**-2 s**-1' = { table2Version = 162 ; indicatorOfParameter = 92 ; @@ -13669,32 +13669,32 @@ table2Version = 162 ; indicatorOfParameter = 51 ; } -#Vertical integral of mass of atmosphere +#Total column vertically-integrated mass of atmosphere 'kg m**-2' = { table2Version = 162 ; indicatorOfParameter = 53 ; } -#Vertical integral of temperature +#Total column vertically-integrated temperature 'K kg m**-2' = { table2Version = 162 ; indicatorOfParameter = 54 ; } -#Vertical integral of water vapour +#Total column vertically-integrated water vapour 'kg m**-2' = { table2Version = 162 ; indicatorOfParameter = 55 ; } -#Vertical integral of cloud liquid water +#Total column vertically-integrated cloud liquid water 'kg m**-2' = { table2Version = 162 ; indicatorOfParameter = 56 ; } -#Vertical integral of cloud frozen water +#Total column vertically-integrated cloud frozen water 'kg m**-2' = { table2Version = 162 ; indicatorOfParameter = 57 ; } -#Vertical integral of ozone +#Total column vertically-integrated ozone 'kg m**-2' = { table2Version = 162 ; indicatorOfParameter = 58 ; @@ -13714,7 +13714,7 @@ table2Version = 162 ; indicatorOfParameter = 61 ; } -#Vertical integral of potential+internal+latent energy +#Total column vertically-integrated potential+internal+latent energy 'J m**-2' = { table2Version = 162 ; indicatorOfParameter = 62 ; @@ -13724,92 +13724,92 @@ table2Version = 162 ; indicatorOfParameter = 63 ; } -#Vertical integral of energy conversion +#Total column vertically-integrated energy conversion 'W m**-2' = { table2Version = 162 ; indicatorOfParameter = 64 ; } -#Vertical integral of eastward mass flux +#Total column vertically-integrated eastward mass flux 'kg m**-1 s**-1' = { table2Version = 162 ; indicatorOfParameter = 65 ; } -#Vertical integral of northward mass flux +#Total column vertically-integrated northward mass flux 'kg m**-1 s**-1' = { table2Version = 162 ; indicatorOfParameter = 66 ; } -#Vertical integral of eastward kinetic energy flux +#Total column vertically-integrated eastward kinetic energy flux 'W m**-1' = { table2Version = 162 ; indicatorOfParameter = 67 ; } -#Vertical integral of northward kinetic energy flux +#Total column vertically-integrated northward kinetic energy flux 'W m**-1' = { table2Version = 162 ; indicatorOfParameter = 68 ; } -#Vertical integral of eastward heat flux +#Total column vertically-integrated eastward heat flux 'W m**-1' = { table2Version = 162 ; indicatorOfParameter = 69 ; } -#Vertical integral of northward heat flux +#Total column vertically-integrated northward heat flux 'W m**-1' = { table2Version = 162 ; indicatorOfParameter = 70 ; } -#Vertical integral of eastward water vapour flux +#Total column vertically-integrated eastward water vapour flux 'kg m**-1 s**-1' = { table2Version = 162 ; indicatorOfParameter = 71 ; } -#Vertical integral of northward water vapour flux +#Total column vertically-integrated northward water vapour flux 'kg m**-1 s**-1' = { table2Version = 162 ; indicatorOfParameter = 72 ; } -#Vertical integral of eastward geopotential flux +#Total column vertically-integrated eastward geopotential flux 'W m**-1' = { table2Version = 162 ; indicatorOfParameter = 73 ; } -#Vertical integral of northward geopotential flux +#Total column vertically-integrated northward geopotential flux 'W m**-1' = { table2Version = 162 ; indicatorOfParameter = 74 ; } -#Vertical integral of eastward total energy flux +#Total column vertically-integrated eastward total energy flux 'W m**-1' = { table2Version = 162 ; indicatorOfParameter = 75 ; } -#Vertical integral of northward total energy flux +#Total column vertically-integrated northward total energy flux 'W m**-1' = { table2Version = 162 ; indicatorOfParameter = 76 ; } -#Vertical integral of eastward ozone flux +#Total column vertically-integrated eastward ozone flux 'kg m**-1 s**-1' = { table2Version = 162 ; indicatorOfParameter = 77 ; } -#Vertical integral of northward ozone flux +#Total column vertically-integrated northward ozone flux 'kg m**-1 s**-1' = { table2Version = 162 ; indicatorOfParameter = 78 ; } -#Vertical integral of divergence of mass flux +#Total column vertically-integrated divergence of mass flux 'kg m**-2 s**-1' = { table2Version = 162 ; indicatorOfParameter = 81 ; } -#Vertical integral of divergence of kinetic energy flux +#Total column vertically-integrated divergence of kinetic energy flux 'W m**-2' = { table2Version = 162 ; indicatorOfParameter = 82 ; } -#Vertical integral of divergence of thermal energy flux +#Total column vertically-integrated divergence of thermal energy flux 'W m**-2' = { table2Version = 162 ; indicatorOfParameter = 83 ; @@ -13819,17 +13819,17 @@ table2Version = 162 ; indicatorOfParameter = 84 ; } -#Vertical integral of divergence of geopotential flux +#Total column vertically-integrated divergence of geopotential flux 'W m**-2' = { table2Version = 162 ; indicatorOfParameter = 85 ; } -#Vertical integral of divergence of total energy flux +#Total column vertically-integrated divergence of total energy flux 'W m**-2' = { table2Version = 162 ; indicatorOfParameter = 86 ; } -#Vertical integral of divergence of ozone flux +#Total column vertically-integrated divergence of ozone flux 'kg m**-2 s**-1' = { table2Version = 162 ; indicatorOfParameter = 87 ; diff --git a/definitions/grib1/localConcepts/rjtd/name.def b/definitions/grib1/localConcepts/rjtd/name.def index 284c4b0b7..3b4fa8db8 100644 --- a/definitions/grib1/localConcepts/rjtd/name.def +++ b/definitions/grib1/localConcepts/rjtd/name.def @@ -910,23 +910,23 @@ table2Version = 200 ; indicatorOfParameter = 87 ; } -#Vertical integral of eastward heat flux -'Vertical integral of eastward heat flux' = { +#Total column vertically-integrated eastward heat flux +'Total column vertically-integrated eastward heat flux' = { table2Version = 200 ; indicatorOfParameter = 190 ; } -#Vertical integral of northward heat flux -'Vertical integral of northward heat flux' = { +#Total column vertically-integrated northward heat flux +'Total column vertically-integrated northward heat flux' = { table2Version = 200 ; indicatorOfParameter = 191 ; } -#Vertical integral of eastward water vapour flux -'Vertical integral of eastward water vapour flux' = { +#Total column vertically-integrated eastward water vapour flux +'Total column vertically-integrated eastward water vapour flux' = { table2Version = 200 ; indicatorOfParameter = 157 ; } -#Vertical integral of northward water vapour flux -'Vertical integral of northward water vapour flux' = { +#Total column vertically-integrated northward water vapour flux +'Total column vertically-integrated northward water vapour flux' = { table2Version = 200 ; indicatorOfParameter = 152 ; } diff --git a/definitions/grib1/localConcepts/rjtd/paramId.def b/definitions/grib1/localConcepts/rjtd/paramId.def index 640b96537..392359de9 100644 --- a/definitions/grib1/localConcepts/rjtd/paramId.def +++ b/definitions/grib1/localConcepts/rjtd/paramId.def @@ -910,22 +910,22 @@ table2Version = 200 ; indicatorOfParameter = 87 ; } -#Vertical integral of eastward heat flux +#Total column vertically-integrated eastward heat flux '162069' = { table2Version = 200 ; indicatorOfParameter = 190 ; } -#Vertical integral of northward heat flux +#Total column vertically-integrated northward heat flux '162070' = { table2Version = 200 ; indicatorOfParameter = 191 ; } -#Vertical integral of eastward water vapour flux +#Total column vertically-integrated eastward water vapour flux '162071' = { table2Version = 200 ; indicatorOfParameter = 157 ; } -#Vertical integral of northward water vapour flux +#Total column vertically-integrated northward water vapour flux '162072' = { table2Version = 200 ; indicatorOfParameter = 152 ; diff --git a/definitions/grib1/localConcepts/rjtd/shortName.def b/definitions/grib1/localConcepts/rjtd/shortName.def index 6ddcc6e86..766592e9b 100644 --- a/definitions/grib1/localConcepts/rjtd/shortName.def +++ b/definitions/grib1/localConcepts/rjtd/shortName.def @@ -910,22 +910,22 @@ table2Version = 200 ; indicatorOfParameter = 87 ; } -#Vertical integral of eastward heat flux +#Total column vertically-integrated eastward heat flux 'vithee' = { table2Version = 200 ; indicatorOfParameter = 190 ; } -#Vertical integral of northward heat flux +#Total column vertically-integrated northward heat flux 'vithen' = { table2Version = 200 ; indicatorOfParameter = 191 ; } -#Vertical integral of eastward water vapour flux +#Total column vertically-integrated eastward water vapour flux 'viwve' = { table2Version = 200 ; indicatorOfParameter = 157 ; } -#Vertical integral of northward water vapour flux +#Total column vertically-integrated northward water vapour flux 'viwvn' = { table2Version = 200 ; indicatorOfParameter = 152 ; diff --git a/definitions/grib1/localConcepts/rjtd/units.def b/definitions/grib1/localConcepts/rjtd/units.def index b3df8c50e..81ef6cf02 100644 --- a/definitions/grib1/localConcepts/rjtd/units.def +++ b/definitions/grib1/localConcepts/rjtd/units.def @@ -910,22 +910,22 @@ table2Version = 200 ; indicatorOfParameter = 87 ; } -#Vertical integral of eastward heat flux +#Total column vertically-integrated eastward heat flux 'W m**-1' = { table2Version = 200 ; indicatorOfParameter = 190 ; } -#Vertical integral of northward heat flux +#Total column vertically-integrated northward heat flux 'W m**-1' = { table2Version = 200 ; indicatorOfParameter = 191 ; } -#Vertical integral of eastward water vapour flux +#Total column vertically-integrated eastward water vapour flux 'kg m**-1 s**-1' = { table2Version = 200 ; indicatorOfParameter = 157 ; } -#Vertical integral of northward water vapour flux +#Total column vertically-integrated northward water vapour flux 'kg m**-1 s**-1' = { table2Version = 200 ; indicatorOfParameter = 152 ; diff --git a/definitions/grib2/cfVarName.def b/definitions/grib2/cfVarName.def index ecfe94186..6ce0a95b5 100644 --- a/definitions/grib2/cfVarName.def +++ b/definitions/grib2/cfVarName.def @@ -245,6 +245,26 @@ scaleFactorOfFirstFixedSurface = 0 ; typeOfStatisticalProcessing = 0 ; } +#Time-maximum 2 metre relative humidity +'max_2r' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 1 ; + typeOfFirstFixedSurface = 103 ; + scaledValueOfFirstFixedSurface = 2 ; + scaleFactorOfFirstFixedSurface = 0 ; + typeOfStatisticalProcessing = 2 ; + } +#Time-minimum 2 metre relative humidity +'min_2r' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 1 ; + typeOfFirstFixedSurface = 103 ; + scaledValueOfFirstFixedSurface = 2 ; + scaleFactorOfFirstFixedSurface = 0 ; + typeOfStatisticalProcessing = 3 ; + } #5-wave geopotential height 'wavh5' = { discipline = 0 ; diff --git a/definitions/grib2/localConcepts/era/name.def b/definitions/grib2/localConcepts/era/name.def index 82944f3b2..1ed54baae 100644 --- a/definitions/grib2/localConcepts/era/name.def +++ b/definitions/grib2/localConcepts/era/name.def @@ -620,128 +620,128 @@ parameterCategory = 162 ; parameterNumber = 51 ; } -#Vertical integral of temperature -'Vertical integral of temperature' = { +#Total column vertically-integrated temperature +'Total column vertically-integrated temperature' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 54 ; } -#Vertical integral of cloud liquid water -'Vertical integral of cloud liquid water' = { +#Total column vertically-integrated cloud liquid water +'Total column vertically-integrated cloud liquid water' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 56 ; } -#Vertical integral of cloud frozen water -'Vertical integral of cloud frozen water' = { +#Total column vertically-integrated cloud frozen water +'Total column vertically-integrated cloud frozen water' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 57 ; } -#Vertical integral of ozone -'Vertical integral of ozone' = { +#Total column vertically-integrated ozone +'Total column vertically-integrated ozone' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 58 ; } -#Vertical integral of energy conversion -'Vertical integral of energy conversion' = { +#Total column vertically-integrated energy conversion +'Total column vertically-integrated energy conversion' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 64 ; } -#Vertical integral of eastward mass flux -'Vertical integral of eastward mass flux' = { +#Total column vertically-integrated eastward mass flux +'Total column vertically-integrated eastward mass flux' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 65 ; } -#Vertical integral of northward mass flux -'Vertical integral of northward mass flux' = { +#Total column vertically-integrated northward mass flux +'Total column vertically-integrated northward mass flux' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 66 ; } -#Vertical integral of eastward kinetic energy flux -'Vertical integral of eastward kinetic energy flux' = { +#Total column vertically-integrated eastward kinetic energy flux +'Total column vertically-integrated eastward kinetic energy flux' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 67 ; } -#Vertical integral of northward kinetic energy flux -'Vertical integral of northward kinetic energy flux' = { +#Total column vertically-integrated northward kinetic energy flux +'Total column vertically-integrated northward kinetic energy flux' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 68 ; } -#Vertical integral of eastward geopotential flux -'Vertical integral of eastward geopotential flux' = { +#Total column vertically-integrated eastward geopotential flux +'Total column vertically-integrated eastward geopotential flux' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 73 ; } -#Vertical integral of northward geopotential flux -'Vertical integral of northward geopotential flux' = { +#Total column vertically-integrated northward geopotential flux +'Total column vertically-integrated northward geopotential flux' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 74 ; } -#Vertical integral of eastward total energy flux -'Vertical integral of eastward total energy flux' = { +#Total column vertically-integrated eastward total energy flux +'Total column vertically-integrated eastward total energy flux' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 75 ; } -#Vertical integral of northward total energy flux -'Vertical integral of northward total energy flux' = { +#Total column vertically-integrated northward total energy flux +'Total column vertically-integrated northward total energy flux' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 76 ; } -#Vertical integral of eastward ozone flux -'Vertical integral of eastward ozone flux' = { +#Total column vertically-integrated eastward ozone flux +'Total column vertically-integrated eastward ozone flux' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 77 ; } -#Vertical integral of northward ozone flux -'Vertical integral of northward ozone flux' = { +#Total column vertically-integrated northward ozone flux +'Total column vertically-integrated northward ozone flux' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 78 ; } -#Vertical integral of divergence of mass flux -'Vertical integral of divergence of mass flux' = { +#Total column vertically-integrated divergence of mass flux +'Total column vertically-integrated divergence of mass flux' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 81 ; } -#Vertical integral of divergence of kinetic energy flux -'Vertical integral of divergence of kinetic energy flux' = { +#Total column vertically-integrated divergence of kinetic energy flux +'Total column vertically-integrated divergence of kinetic energy flux' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 82 ; } -#Vertical integral of divergence of thermal energy flux -'Vertical integral of divergence of thermal energy flux' = { +#Total column vertically-integrated divergence of thermal energy flux +'Total column vertically-integrated divergence of thermal energy flux' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 83 ; } -#Vertical integral of divergence of geopotential flux -'Vertical integral of divergence of geopotential flux' = { +#Total column vertically-integrated divergence of geopotential flux +'Total column vertically-integrated divergence of geopotential flux' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 85 ; } -#Vertical integral of divergence of total energy flux -'Vertical integral of divergence of total energy flux' = { +#Total column vertically-integrated divergence of total energy flux +'Total column vertically-integrated divergence of total energy flux' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 86 ; } -#Vertical integral of divergence of ozone flux -'Vertical integral of divergence of ozone flux' = { +#Total column vertically-integrated divergence of ozone flux +'Total column vertically-integrated divergence of ozone flux' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 87 ; diff --git a/definitions/grib2/localConcepts/era/paramId.def b/definitions/grib2/localConcepts/era/paramId.def index b4c978e14..592523141 100644 --- a/definitions/grib2/localConcepts/era/paramId.def +++ b/definitions/grib2/localConcepts/era/paramId.def @@ -620,127 +620,127 @@ parameterCategory = 162 ; parameterNumber = 51 ; } -#Vertical integral of temperature +#Total column vertically-integrated temperature '162054' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 54 ; } -#Vertical integral of cloud liquid water +#Total column vertically-integrated cloud liquid water '162056' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 56 ; } -#Vertical integral of cloud frozen water +#Total column vertically-integrated cloud frozen water '162057' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 57 ; } -#Vertical integral of ozone +#Total column vertically-integrated ozone '162058' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 58 ; } -#Vertical integral of energy conversion +#Total column vertically-integrated energy conversion '162064' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 64 ; } -#Vertical integral of eastward mass flux +#Total column vertically-integrated eastward mass flux '162065' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 65 ; } -#Vertical integral of northward mass flux +#Total column vertically-integrated northward mass flux '162066' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 66 ; } -#Vertical integral of eastward kinetic energy flux +#Total column vertically-integrated eastward kinetic energy flux '162067' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 67 ; } -#Vertical integral of northward kinetic energy flux +#Total column vertically-integrated northward kinetic energy flux '162068' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 68 ; } -#Vertical integral of eastward geopotential flux +#Total column vertically-integrated eastward geopotential flux '162073' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 73 ; } -#Vertical integral of northward geopotential flux +#Total column vertically-integrated northward geopotential flux '162074' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 74 ; } -#Vertical integral of eastward total energy flux +#Total column vertically-integrated eastward total energy flux '162075' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 75 ; } -#Vertical integral of northward total energy flux +#Total column vertically-integrated northward total energy flux '162076' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 76 ; } -#Vertical integral of eastward ozone flux +#Total column vertically-integrated eastward ozone flux '162077' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 77 ; } -#Vertical integral of northward ozone flux +#Total column vertically-integrated northward ozone flux '162078' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 78 ; } -#Vertical integral of divergence of mass flux +#Total column vertically-integrated divergence of mass flux '162081' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 81 ; } -#Vertical integral of divergence of kinetic energy flux +#Total column vertically-integrated divergence of kinetic energy flux '162082' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 82 ; } -#Vertical integral of divergence of thermal energy flux +#Total column vertically-integrated divergence of thermal energy flux '162083' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 83 ; } -#Vertical integral of divergence of geopotential flux +#Total column vertically-integrated divergence of geopotential flux '162085' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 85 ; } -#Vertical integral of divergence of total energy flux +#Total column vertically-integrated divergence of total energy flux '162086' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 86 ; } -#Vertical integral of divergence of ozone flux +#Total column vertically-integrated divergence of ozone flux '162087' = { discipline = 192 ; parameterCategory = 162 ; diff --git a/definitions/grib2/localConcepts/era/shortName.def b/definitions/grib2/localConcepts/era/shortName.def index eed1dffc3..41390b397 100644 --- a/definitions/grib2/localConcepts/era/shortName.def +++ b/definitions/grib2/localConcepts/era/shortName.def @@ -620,127 +620,127 @@ parameterCategory = 162 ; parameterNumber = 51 ; } -#Vertical integral of temperature +#Total column vertically-integrated temperature 'vit' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 54 ; } -#Vertical integral of cloud liquid water +#Total column vertically-integrated cloud liquid water 'vilw' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 56 ; } -#Vertical integral of cloud frozen water +#Total column vertically-integrated cloud frozen water 'viiw' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 57 ; } -#Vertical integral of ozone +#Total column vertically-integrated ozone 'vioz' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 58 ; } -#Vertical integral of energy conversion +#Total column vertically-integrated energy conversion 'viec' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 64 ; } -#Vertical integral of eastward mass flux +#Total column vertically-integrated eastward mass flux 'vimae' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 65 ; } -#Vertical integral of northward mass flux +#Total column vertically-integrated northward mass flux 'viman' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 66 ; } -#Vertical integral of eastward kinetic energy flux +#Total column vertically-integrated eastward kinetic energy flux 'vikee' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 67 ; } -#Vertical integral of northward kinetic energy flux +#Total column vertically-integrated northward kinetic energy flux 'viken' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 68 ; } -#Vertical integral of eastward geopotential flux +#Total column vertically-integrated eastward geopotential flux 'vige' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 73 ; } -#Vertical integral of northward geopotential flux +#Total column vertically-integrated northward geopotential flux 'vign' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 74 ; } -#Vertical integral of eastward total energy flux +#Total column vertically-integrated eastward total energy flux 'vitee' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 75 ; } -#Vertical integral of northward total energy flux +#Total column vertically-integrated northward total energy flux 'viten' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 76 ; } -#Vertical integral of eastward ozone flux +#Total column vertically-integrated eastward ozone flux 'vioze' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 77 ; } -#Vertical integral of northward ozone flux +#Total column vertically-integrated northward ozone flux 'viozn' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 78 ; } -#Vertical integral of divergence of mass flux +#Total column vertically-integrated divergence of mass flux 'vimad' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 81 ; } -#Vertical integral of divergence of kinetic energy flux +#Total column vertically-integrated divergence of kinetic energy flux 'viked' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 82 ; } -#Vertical integral of divergence of thermal energy flux +#Total column vertically-integrated divergence of thermal energy flux 'vithed' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 83 ; } -#Vertical integral of divergence of geopotential flux +#Total column vertically-integrated divergence of geopotential flux 'vigd' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 85 ; } -#Vertical integral of divergence of total energy flux +#Total column vertically-integrated divergence of total energy flux 'vited' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 86 ; } -#Vertical integral of divergence of ozone flux +#Total column vertically-integrated divergence of ozone flux 'viozd' = { discipline = 192 ; parameterCategory = 162 ; diff --git a/definitions/grib2/localConcepts/era/units.def b/definitions/grib2/localConcepts/era/units.def index 28ac983af..171b1f44d 100644 --- a/definitions/grib2/localConcepts/era/units.def +++ b/definitions/grib2/localConcepts/era/units.def @@ -620,127 +620,127 @@ parameterCategory = 162 ; parameterNumber = 51 ; } -#Vertical integral of temperature +#Total column vertically-integrated temperature 'K kg m**-2' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 54 ; } -#Vertical integral of cloud liquid water +#Total column vertically-integrated cloud liquid water 'kg m**-2' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 56 ; } -#Vertical integral of cloud frozen water +#Total column vertically-integrated cloud frozen water 'kg m**-2' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 57 ; } -#Vertical integral of ozone +#Total column vertically-integrated ozone 'kg m**-2' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 58 ; } -#Vertical integral of energy conversion +#Total column vertically-integrated energy conversion 'W m**-2' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 64 ; } -#Vertical integral of eastward mass flux +#Total column vertically-integrated eastward mass flux 'kg m**-1 s**-1' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 65 ; } -#Vertical integral of northward mass flux +#Total column vertically-integrated northward mass flux 'kg m**-1 s**-1' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 66 ; } -#Vertical integral of eastward kinetic energy flux +#Total column vertically-integrated eastward kinetic energy flux 'W m**-1' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 67 ; } -#Vertical integral of northward kinetic energy flux +#Total column vertically-integrated northward kinetic energy flux 'W m**-1' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 68 ; } -#Vertical integral of eastward geopotential flux +#Total column vertically-integrated eastward geopotential flux 'W m**-1' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 73 ; } -#Vertical integral of northward geopotential flux +#Total column vertically-integrated northward geopotential flux 'W m**-1' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 74 ; } -#Vertical integral of eastward total energy flux +#Total column vertically-integrated eastward total energy flux 'W m**-1' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 75 ; } -#Vertical integral of northward total energy flux +#Total column vertically-integrated northward total energy flux 'W m**-1' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 76 ; } -#Vertical integral of eastward ozone flux +#Total column vertically-integrated eastward ozone flux 'kg m**-1 s**-1' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 77 ; } -#Vertical integral of northward ozone flux +#Total column vertically-integrated northward ozone flux 'kg m**-1 s**-1' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 78 ; } -#Vertical integral of divergence of mass flux +#Total column vertically-integrated divergence of mass flux 'kg m**-2 s**-1' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 81 ; } -#Vertical integral of divergence of kinetic energy flux +#Total column vertically-integrated divergence of kinetic energy flux 'W m**-2' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 82 ; } -#Vertical integral of divergence of thermal energy flux +#Total column vertically-integrated divergence of thermal energy flux 'W m**-2' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 83 ; } -#Vertical integral of divergence of geopotential flux +#Total column vertically-integrated divergence of geopotential flux 'W m**-2' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 85 ; } -#Vertical integral of divergence of total energy flux +#Total column vertically-integrated divergence of total energy flux 'W m**-2' = { discipline = 192 ; parameterCategory = 162 ; parameterNumber = 86 ; } -#Vertical integral of divergence of ozone flux +#Total column vertically-integrated divergence of ozone flux 'kg m**-2 s**-1' = { discipline = 192 ; parameterCategory = 162 ; diff --git a/definitions/grib2/localConcepts/era6/name.def b/definitions/grib2/localConcepts/era6/name.def index 6115bfbef..b8857e1c1 100644 --- a/definitions/grib2/localConcepts/era6/name.def +++ b/definitions/grib2/localConcepts/era6/name.def @@ -392,8 +392,8 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated eastward ozone flux -'Time integrated, vertically integrated eastward ozone flux' = { +#Time-integrated total column vertically-integrated eastward ozone flux +'Time-integrated total column vertically-integrated eastward ozone flux' = { discipline = 0 ; parameterCategory = 20 ; parameterNumber = 78 ; @@ -403,8 +403,8 @@ typeOfStatisticalProcessing = 1 ; is_chemical = 1 ; } -#Time integrated, vertically integrated northward ozone flux -'Time integrated, vertically integrated northward ozone flux' = { +#Time-integrated total column vertically-integrated northward ozone flux +'Time-integrated total column vertically-integrated northward ozone flux' = { discipline = 0 ; parameterCategory = 20 ; parameterNumber = 79 ; @@ -414,8 +414,8 @@ typeOfStatisticalProcessing = 1 ; is_chemical = 1 ; } -#Time integrated, vertically integrated divergence of ozone flux -'Time integrated, vertically integrated divergence of ozone flux' = { +#Time-integrated total column vertically-integrated divergence of ozone flux +'Time-integrated total column vertically-integrated divergence of ozone flux' = { discipline = 0 ; parameterCategory = 20 ; parameterNumber = 80 ; @@ -425,8 +425,8 @@ typeOfStatisticalProcessing = 1 ; is_chemical = 1 ; } -#Time integrated, vertically integrated net source of ozone -'Time integrated, vertically integrated net source of ozone' = { +#Time-integrated total column vertically-integrated net source of ozone +'Time-integrated total column vertically-integrated net source of ozone' = { discipline = 0 ; parameterCategory = 20 ; parameterNumber = 81 ; diff --git a/definitions/grib2/localConcepts/era6/paramId.def b/definitions/grib2/localConcepts/era6/paramId.def index 00d86b9ba..b288a4d9e 100644 --- a/definitions/grib2/localConcepts/era6/paramId.def +++ b/definitions/grib2/localConcepts/era6/paramId.def @@ -392,7 +392,7 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated eastward ozone flux +#Time-integrated total column vertically-integrated eastward ozone flux '233032' = { discipline = 0 ; parameterCategory = 20 ; @@ -403,7 +403,7 @@ typeOfStatisticalProcessing = 1 ; is_chemical = 1 ; } -#Time integrated, vertically integrated northward ozone flux +#Time-integrated total column vertically-integrated northward ozone flux '233033' = { discipline = 0 ; parameterCategory = 20 ; @@ -414,7 +414,7 @@ typeOfStatisticalProcessing = 1 ; is_chemical = 1 ; } -#Time integrated, vertically integrated divergence of ozone flux +#Time-integrated total column vertically-integrated divergence of ozone flux '233034' = { discipline = 0 ; parameterCategory = 20 ; @@ -425,7 +425,7 @@ typeOfStatisticalProcessing = 1 ; is_chemical = 1 ; } -#Time integrated, vertically integrated net source of ozone +#Time-integrated total column vertically-integrated net source of ozone '233035' = { discipline = 0 ; parameterCategory = 20 ; diff --git a/definitions/grib2/localConcepts/era6/shortName.def b/definitions/grib2/localConcepts/era6/shortName.def index 6976a2397..02dd1e85c 100644 --- a/definitions/grib2/localConcepts/era6/shortName.def +++ b/definitions/grib2/localConcepts/era6/shortName.def @@ -392,7 +392,7 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated eastward ozone flux +#Time-integrated total column vertically-integrated eastward ozone flux 'tvioze' = { discipline = 0 ; parameterCategory = 20 ; @@ -403,7 +403,7 @@ typeOfStatisticalProcessing = 1 ; is_chemical = 1 ; } -#Time integrated, vertically integrated northward ozone flux +#Time-integrated total column vertically-integrated northward ozone flux 'tviozn' = { discipline = 0 ; parameterCategory = 20 ; @@ -414,7 +414,7 @@ typeOfStatisticalProcessing = 1 ; is_chemical = 1 ; } -#Time integrated, vertically integrated divergence of ozone flux +#Time-integrated total column vertically-integrated divergence of ozone flux 'tviozd' = { discipline = 0 ; parameterCategory = 20 ; @@ -425,7 +425,7 @@ typeOfStatisticalProcessing = 1 ; is_chemical = 1 ; } -#Time integrated, vertically integrated net source of ozone +#Time-integrated total column vertically-integrated net source of ozone 'tvions' = { discipline = 0 ; parameterCategory = 20 ; diff --git a/definitions/grib2/localConcepts/era6/units.def b/definitions/grib2/localConcepts/era6/units.def index edadfafe8..f6cb25b31 100644 --- a/definitions/grib2/localConcepts/era6/units.def +++ b/definitions/grib2/localConcepts/era6/units.def @@ -392,7 +392,7 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated eastward ozone flux +#Time-integrated total column vertically-integrated eastward ozone flux 'kg m**-1' = { discipline = 0 ; parameterCategory = 20 ; @@ -403,7 +403,7 @@ typeOfStatisticalProcessing = 1 ; is_chemical = 1 ; } -#Time integrated, vertically integrated northward ozone flux +#Time-integrated total column vertically-integrated northward ozone flux 'kg m**-1' = { discipline = 0 ; parameterCategory = 20 ; @@ -414,7 +414,7 @@ typeOfStatisticalProcessing = 1 ; is_chemical = 1 ; } -#Time integrated, vertically integrated divergence of ozone flux +#Time-integrated total column vertically-integrated divergence of ozone flux 'kg m**-2' = { discipline = 0 ; parameterCategory = 20 ; @@ -425,7 +425,7 @@ typeOfStatisticalProcessing = 1 ; is_chemical = 1 ; } -#Time integrated, vertically integrated net source of ozone +#Time-integrated total column vertically-integrated net source of ozone 'kg m**-2' = { discipline = 0 ; parameterCategory = 20 ; diff --git a/definitions/grib2/name.def b/definitions/grib2/name.def index d8c5a96fe..56d6adccc 100644 --- a/definitions/grib2/name.def +++ b/definitions/grib2/name.def @@ -4301,8 +4301,8 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time-integrated, total column vertically-integrated divergence of mass flux -'Time-integrated, total column vertically-integrated divergence of mass flux' = { +#Time-integrated total column vertically-integrated divergence of mass flux +'Time-integrated total column vertically-integrated divergence of mass flux' = { discipline = 0 ; parameterCategory = 3 ; parameterNumber = 35 ; @@ -4310,8 +4310,8 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time-integrated, total column vertically-integrated eastward mass flux -'Time-integrated, total column vertically-integrated eastward mass flux' = { +#Time-integrated total column vertically-integrated eastward mass flux +'Time-integrated total column vertically-integrated eastward mass flux' = { discipline = 0 ; parameterCategory = 3 ; parameterNumber = 36 ; @@ -4319,8 +4319,8 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time-integrated, total column vertically-integrated northward mass flux -'Time-integrated, total column vertically-integrated northward mass flux' = { +#Time-integrated total column vertically-integrated northward mass flux +'Time-integrated total column vertically-integrated northward mass flux' = { discipline = 0 ; parameterCategory = 3 ; parameterNumber = 37 ; @@ -4328,8 +4328,8 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated divergence of water vapour flux -'Time integrated, vertically integrated divergence of water vapour flux' = { +#Time-integrated total column vertically-integrated divergence of water vapour flux +'Time-integrated total column vertically-integrated divergence of water vapour flux' = { discipline = 0 ; parameterCategory = 1 ; parameterNumber = 160 ; @@ -4337,8 +4337,8 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated divergence of cloud liquid water flux -'Time integrated, vertically integrated divergence of cloud liquid water flux' = { +#Time-integrated total column vertically-integrated divergence of cloud liquid water flux +'Time-integrated total column vertically-integrated divergence of cloud liquid water flux' = { discipline = 0 ; parameterCategory = 1 ; parameterNumber = 161 ; @@ -4346,8 +4346,8 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated divergence of cloud ice water flux -'Time integrated, vertically integrated divergence of cloud ice water flux' = { +#Time-integrated total column vertically-integrated divergence of cloud ice water flux +'Time-integrated total column vertically-integrated divergence of cloud ice water flux' = { discipline = 0 ; parameterCategory = 1 ; parameterNumber = 162 ; @@ -4355,8 +4355,8 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated divergence of rain flux -'Time integrated, vertically integrated divergence of rain flux' = { +#Time-integrated total column vertically-integrated divergence of rain flux +'Time-integrated total column vertically-integrated divergence of rain flux' = { discipline = 0 ; parameterCategory = 1 ; parameterNumber = 163 ; @@ -4364,8 +4364,8 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated divergence of snow flux -'Time integrated, vertically integrated divergence of snow flux' = { +#Time-integrated total column vertically-integrated divergence of snow flux +'Time-integrated total column vertically-integrated divergence of snow flux' = { discipline = 0 ; parameterCategory = 1 ; parameterNumber = 164 ; @@ -4373,8 +4373,8 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated eastward water vapour flux -'Time integrated, vertically integrated eastward water vapour flux' = { +#Time-integrated total column vertically-integrated eastward water vapour flux +'Time-integrated total column vertically-integrated eastward water vapour flux' = { discipline = 0 ; parameterCategory = 1 ; parameterNumber = 150 ; @@ -4382,8 +4382,8 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated northward water vapour flux -'Time integrated, vertically integrated northward water vapour flux' = { +#Time-integrated total column vertically-integrated northward water vapour flux +'Time-integrated total column vertically-integrated northward water vapour flux' = { discipline = 0 ; parameterCategory = 1 ; parameterNumber = 151 ; @@ -4391,8 +4391,8 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated eastward cloud liquid water flux -'Time integrated, vertically integrated eastward cloud liquid water flux' = { +#Time-integrated total column vertically-integrated eastward cloud liquid water flux +'Time-integrated total column vertically-integrated eastward cloud liquid water flux' = { discipline = 0 ; parameterCategory = 1 ; parameterNumber = 152 ; @@ -4400,8 +4400,8 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated northward cloud liquid water flux -'Time integrated, vertically integrated northward cloud liquid water flux' = { +#Time-integrated total column vertically-integrated northward cloud liquid water flux +'Time-integrated total column vertically-integrated northward cloud liquid water flux' = { discipline = 0 ; parameterCategory = 1 ; parameterNumber = 153 ; @@ -4409,8 +4409,8 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated eastward cloud ice water flux -'Time integrated, vertically integrated eastward cloud ice water flux' = { +#Time-integrated total column vertically-integrated eastward cloud ice water flux +'Time-integrated total column vertically-integrated eastward cloud ice water flux' = { discipline = 0 ; parameterCategory = 1 ; parameterNumber = 154 ; @@ -4418,8 +4418,8 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated northward cloud ice water flux -'Time integrated, vertically integrated northward cloud ice water flux' = { +#Time-integrated total column vertically-integrated northward cloud ice water flux +'Time-integrated total column vertically-integrated northward cloud ice water flux' = { discipline = 0 ; parameterCategory = 1 ; parameterNumber = 155 ; @@ -4427,8 +4427,8 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated eastward rain flux -'Time integrated, vertically integrated eastward rain flux' = { +#Time-integrated total column vertically-integrated eastward rain flux +'Time-integrated total column vertically-integrated eastward rain flux' = { discipline = 0 ; parameterCategory = 1 ; parameterNumber = 156 ; @@ -4436,8 +4436,8 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated northward rain flux -'Time integrated, vertically integrated northward rain flux' = { +#Time-integrated total column vertically-integrated northward rain flux +'Time-integrated total column vertically-integrated northward rain flux' = { discipline = 0 ; parameterCategory = 1 ; parameterNumber = 157 ; @@ -4445,8 +4445,8 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated eastward snow flux -'Time integrated, vertically integrated eastward snow flux' = { +#Time-integrated total column vertically-integrated eastward snow flux +'Time-integrated total column vertically-integrated eastward snow flux' = { discipline = 0 ; parameterCategory = 1 ; parameterNumber = 158 ; @@ -4454,8 +4454,8 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated northward snow flux -'Time integrated, vertically integrated northward snow flux' = { +#Time-integrated total column vertically-integrated northward snow flux +'Time-integrated total column vertically-integrated northward snow flux' = { discipline = 0 ; parameterCategory = 1 ; parameterNumber = 159 ; @@ -11284,8 +11284,8 @@ parameterCategory = 0 ; parameterNumber = 50 ; } -#Vertical integral of mass of atmosphere -'Vertical integral of mass of atmosphere' = { +#Total column vertically-integrated mass of atmosphere +'Total column vertically-integrated mass of atmosphere' = { discipline = 0 ; parameterCategory = 3 ; parameterNumber = 39 ; @@ -11316,8 +11316,8 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of potential+internal+latent energy -'Vertical integral of potential+internal+latent energy' = { +#Total column vertically-integrated potential+internal+latent energy +'Total column vertically-integrated potential+internal+latent energy' = { discipline = 0 ; parameterCategory = 21 ; parameterNumber = 21 ; @@ -11332,104 +11332,104 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of eastward mass flux -'Vertical integral of eastward mass flux' = { +#Total column vertically-integrated eastward mass flux +'Total column vertically-integrated eastward mass flux' = { discipline = 0 ; parameterCategory = 3 ; parameterNumber = 36 ; typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of northward mass flux -'Vertical integral of northward mass flux' = { +#Total column vertically-integrated northward mass flux +'Total column vertically-integrated northward mass flux' = { discipline = 0 ; parameterCategory = 3 ; parameterNumber = 37 ; typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of eastward kinetic energy flux -'Vertical integral of eastward kinetic energy flux' = { +#Total column vertically-integrated eastward kinetic energy flux +'Total column vertically-integrated eastward kinetic energy flux' = { discipline = 0 ; parameterCategory = 21 ; parameterNumber = 9 ; typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of northward kinetic energy flux -'Vertical integral of northward kinetic energy flux' = { +#Total column vertically-integrated northward kinetic energy flux +'Total column vertically-integrated northward kinetic energy flux' = { discipline = 0 ; parameterCategory = 21 ; parameterNumber = 10 ; typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of eastward heat flux -'Vertical integral of eastward heat flux' = { +#Total column vertically-integrated eastward heat flux +'Total column vertically-integrated eastward heat flux' = { discipline = 0 ; parameterCategory = 21 ; parameterNumber = 19 ; typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of northward heat flux -'Vertical integral of northward heat flux' = { +#Total column vertically-integrated northward heat flux +'Total column vertically-integrated northward heat flux' = { discipline = 0 ; parameterCategory = 21 ; parameterNumber = 20 ; typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of eastward water vapour flux -'Vertical integral of eastward water vapour flux' = { +#Total column vertically-integrated eastward water vapour flux +'Total column vertically-integrated eastward water vapour flux' = { discipline = 0 ; parameterCategory = 1 ; parameterNumber = 150 ; typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of northward water vapour flux -'Vertical integral of northward water vapour flux' = { +#Total column vertically-integrated northward water vapour flux +'Total column vertically-integrated northward water vapour flux' = { discipline = 0 ; parameterCategory = 1 ; parameterNumber = 151 ; typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of eastward geopotential flux -'Vertical integral of eastward geopotential flux' = { +#Total column vertically-integrated eastward geopotential flux +'Total column vertically-integrated eastward geopotential flux' = { discipline = 0 ; parameterCategory = 3 ; parameterNumber = 40 ; typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of northward geopotential flux -'Vertical integral of northward geopotential flux' = { +#Total column vertically-integrated northward geopotential flux +'Total column vertically-integrated northward geopotential flux' = { discipline = 0 ; parameterCategory = 3 ; parameterNumber = 41 ; typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of eastward total energy flux -'Vertical integral of eastward total energy flux' = { +#Total column vertically-integrated eastward total energy flux +'Total column vertically-integrated eastward total energy flux' = { discipline = 0 ; parameterCategory = 21 ; parameterNumber = 11 ; typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of northward total energy flux -'Vertical integral of northward total energy flux' = { +#Total column vertically-integrated northward total energy flux +'Total column vertically-integrated northward total energy flux' = { discipline = 0 ; parameterCategory = 21 ; parameterNumber = 12 ; typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of eastward ozone flux -'Vertical integral of eastward ozone flux' = { +#Total column vertically-integrated eastward ozone flux +'Total column vertically-integrated eastward ozone flux' = { discipline = 0 ; parameterCategory = 20 ; parameterNumber = 78 ; @@ -11437,8 +11437,8 @@ typeOfSecondFixedSurface = 8 ; constituentType = 0 ; } -#Vertical integral of northward ozone flux -'Vertical integral of northward ozone flux' = { +#Total column vertically-integrated northward ozone flux +'Total column vertically-integrated northward ozone flux' = { discipline = 0 ; parameterCategory = 20 ; parameterNumber = 79 ; @@ -11446,16 +11446,16 @@ typeOfSecondFixedSurface = 8 ; constituentType = 0 ; } -#Vertical integral of divergence of mass flux -'Vertical integral of divergence of mass flux' = { +#Total column vertically-integrated divergence of mass flux +'Total column vertically-integrated divergence of mass flux' = { discipline = 0 ; parameterCategory = 3 ; parameterNumber = 35 ; typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of divergence of kinetic energy flux -'Vertical integral of divergence of kinetic energy flux' = { +#Total column vertically-integrated divergence of kinetic energy flux +'Total column vertically-integrated divergence of kinetic energy flux' = { discipline = 0 ; parameterCategory = 21 ; parameterNumber = 16 ; @@ -11470,24 +11470,24 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of divergence of geopotential flux -'Vertical integral of divergence of geopotential flux' = { +#Total column vertically-integrated divergence of geopotential flux +'Total column vertically-integrated divergence of geopotential flux' = { discipline = 0 ; parameterCategory = 3 ; parameterNumber = 43 ; typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of divergence of total energy flux -'Vertical integral of divergence of total energy flux' = { +#Total column vertically-integrated divergence of total energy flux +'Total column vertically-integrated divergence of total energy flux' = { discipline = 0 ; parameterCategory = 21 ; parameterNumber = 17 ; typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of divergence of ozone flux -'Vertical integral of divergence of ozone flux' = { +#Total column vertically-integrated divergence of ozone flux +'Total column vertically-integrated divergence of ozone flux' = { discipline = 0 ; parameterCategory = 20 ; parameterNumber = 80 ; diff --git a/definitions/grib2/paramId.def b/definitions/grib2/paramId.def index 526405e73..6d5c38537 100644 --- a/definitions/grib2/paramId.def +++ b/definitions/grib2/paramId.def @@ -4301,7 +4301,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time-integrated, total column vertically-integrated divergence of mass flux +#Time-integrated total column vertically-integrated divergence of mass flux '233014' = { discipline = 0 ; parameterCategory = 3 ; @@ -4310,7 +4310,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time-integrated, total column vertically-integrated eastward mass flux +#Time-integrated total column vertically-integrated eastward mass flux '233015' = { discipline = 0 ; parameterCategory = 3 ; @@ -4319,7 +4319,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time-integrated, total column vertically-integrated northward mass flux +#Time-integrated total column vertically-integrated northward mass flux '233016' = { discipline = 0 ; parameterCategory = 3 ; @@ -4328,7 +4328,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated divergence of water vapour flux +#Time-integrated total column vertically-integrated divergence of water vapour flux '233017' = { discipline = 0 ; parameterCategory = 1 ; @@ -4337,7 +4337,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated divergence of cloud liquid water flux +#Time-integrated total column vertically-integrated divergence of cloud liquid water flux '233018' = { discipline = 0 ; parameterCategory = 1 ; @@ -4346,7 +4346,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated divergence of cloud ice water flux +#Time-integrated total column vertically-integrated divergence of cloud ice water flux '233019' = { discipline = 0 ; parameterCategory = 1 ; @@ -4355,7 +4355,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated divergence of rain flux +#Time-integrated total column vertically-integrated divergence of rain flux '233020' = { discipline = 0 ; parameterCategory = 1 ; @@ -4364,7 +4364,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated divergence of snow flux +#Time-integrated total column vertically-integrated divergence of snow flux '233021' = { discipline = 0 ; parameterCategory = 1 ; @@ -4373,7 +4373,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated eastward water vapour flux +#Time-integrated total column vertically-integrated eastward water vapour flux '233022' = { discipline = 0 ; parameterCategory = 1 ; @@ -4382,7 +4382,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated northward water vapour flux +#Time-integrated total column vertically-integrated northward water vapour flux '233023' = { discipline = 0 ; parameterCategory = 1 ; @@ -4391,7 +4391,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated eastward cloud liquid water flux +#Time-integrated total column vertically-integrated eastward cloud liquid water flux '233024' = { discipline = 0 ; parameterCategory = 1 ; @@ -4400,7 +4400,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated northward cloud liquid water flux +#Time-integrated total column vertically-integrated northward cloud liquid water flux '233025' = { discipline = 0 ; parameterCategory = 1 ; @@ -4409,7 +4409,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated eastward cloud ice water flux +#Time-integrated total column vertically-integrated eastward cloud ice water flux '233026' = { discipline = 0 ; parameterCategory = 1 ; @@ -4418,7 +4418,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated northward cloud ice water flux +#Time-integrated total column vertically-integrated northward cloud ice water flux '233027' = { discipline = 0 ; parameterCategory = 1 ; @@ -4427,7 +4427,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated eastward rain flux +#Time-integrated total column vertically-integrated eastward rain flux '233028' = { discipline = 0 ; parameterCategory = 1 ; @@ -4436,7 +4436,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated northward rain flux +#Time-integrated total column vertically-integrated northward rain flux '233029' = { discipline = 0 ; parameterCategory = 1 ; @@ -4445,7 +4445,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated eastward snow flux +#Time-integrated total column vertically-integrated eastward snow flux '233030' = { discipline = 0 ; parameterCategory = 1 ; @@ -4454,7 +4454,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated northward snow flux +#Time-integrated total column vertically-integrated northward snow flux '233031' = { discipline = 0 ; parameterCategory = 1 ; @@ -11284,7 +11284,7 @@ parameterCategory = 0 ; parameterNumber = 50 ; } -#Vertical integral of mass of atmosphere +#Total column vertically-integrated mass of atmosphere '162053' = { discipline = 0 ; parameterCategory = 3 ; @@ -11316,7 +11316,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of potential+internal+latent energy +#Total column vertically-integrated potential+internal+latent energy '162062' = { discipline = 0 ; parameterCategory = 21 ; @@ -11332,7 +11332,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of eastward mass flux +#Total column vertically-integrated eastward mass flux '162065' = { discipline = 0 ; parameterCategory = 3 ; @@ -11340,7 +11340,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of northward mass flux +#Total column vertically-integrated northward mass flux '162066' = { discipline = 0 ; parameterCategory = 3 ; @@ -11348,7 +11348,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of eastward kinetic energy flux +#Total column vertically-integrated eastward kinetic energy flux '162067' = { discipline = 0 ; parameterCategory = 21 ; @@ -11356,7 +11356,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of northward kinetic energy flux +#Total column vertically-integrated northward kinetic energy flux '162068' = { discipline = 0 ; parameterCategory = 21 ; @@ -11364,7 +11364,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of eastward heat flux +#Total column vertically-integrated eastward heat flux '162069' = { discipline = 0 ; parameterCategory = 21 ; @@ -11372,7 +11372,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of northward heat flux +#Total column vertically-integrated northward heat flux '162070' = { discipline = 0 ; parameterCategory = 21 ; @@ -11380,7 +11380,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of eastward water vapour flux +#Total column vertically-integrated eastward water vapour flux '162071' = { discipline = 0 ; parameterCategory = 1 ; @@ -11388,7 +11388,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of northward water vapour flux +#Total column vertically-integrated northward water vapour flux '162072' = { discipline = 0 ; parameterCategory = 1 ; @@ -11396,7 +11396,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of eastward geopotential flux +#Total column vertically-integrated eastward geopotential flux '162073' = { discipline = 0 ; parameterCategory = 3 ; @@ -11404,7 +11404,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of northward geopotential flux +#Total column vertically-integrated northward geopotential flux '162074' = { discipline = 0 ; parameterCategory = 3 ; @@ -11412,7 +11412,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of eastward total energy flux +#Total column vertically-integrated eastward total energy flux '162075' = { discipline = 0 ; parameterCategory = 21 ; @@ -11420,7 +11420,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of northward total energy flux +#Total column vertically-integrated northward total energy flux '162076' = { discipline = 0 ; parameterCategory = 21 ; @@ -11428,7 +11428,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of eastward ozone flux +#Total column vertically-integrated eastward ozone flux '162077' = { discipline = 0 ; parameterCategory = 20 ; @@ -11437,7 +11437,7 @@ typeOfSecondFixedSurface = 8 ; constituentType = 0 ; } -#Vertical integral of northward ozone flux +#Total column vertically-integrated northward ozone flux '162078' = { discipline = 0 ; parameterCategory = 20 ; @@ -11446,7 +11446,7 @@ typeOfSecondFixedSurface = 8 ; constituentType = 0 ; } -#Vertical integral of divergence of mass flux +#Total column vertically-integrated divergence of mass flux '162081' = { discipline = 0 ; parameterCategory = 3 ; @@ -11454,7 +11454,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of divergence of kinetic energy flux +#Total column vertically-integrated divergence of kinetic energy flux '162082' = { discipline = 0 ; parameterCategory = 21 ; @@ -11470,7 +11470,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of divergence of geopotential flux +#Total column vertically-integrated divergence of geopotential flux '162085' = { discipline = 0 ; parameterCategory = 3 ; @@ -11478,7 +11478,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of divergence of total energy flux +#Total column vertically-integrated divergence of total energy flux '162086' = { discipline = 0 ; parameterCategory = 21 ; @@ -11486,7 +11486,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of divergence of ozone flux +#Total column vertically-integrated divergence of ozone flux '162087' = { discipline = 0 ; parameterCategory = 20 ; diff --git a/definitions/grib2/shortName.def b/definitions/grib2/shortName.def index ecaa6ff1f..78d215c1c 100644 --- a/definitions/grib2/shortName.def +++ b/definitions/grib2/shortName.def @@ -4301,7 +4301,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time-integrated, total column vertically-integrated divergence of mass flux +#Time-integrated total column vertically-integrated divergence of mass flux 'tvimad' = { discipline = 0 ; parameterCategory = 3 ; @@ -4310,7 +4310,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time-integrated, total column vertically-integrated eastward mass flux +#Time-integrated total column vertically-integrated eastward mass flux 'tvimae' = { discipline = 0 ; parameterCategory = 3 ; @@ -4319,7 +4319,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time-integrated, total column vertically-integrated northward mass flux +#Time-integrated total column vertically-integrated northward mass flux 'tviman' = { discipline = 0 ; parameterCategory = 3 ; @@ -4328,7 +4328,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated divergence of water vapour flux +#Time-integrated total column vertically-integrated divergence of water vapour flux 'tviwvd' = { discipline = 0 ; parameterCategory = 1 ; @@ -4337,7 +4337,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated divergence of cloud liquid water flux +#Time-integrated total column vertically-integrated divergence of cloud liquid water flux 'tviclwd' = { discipline = 0 ; parameterCategory = 1 ; @@ -4346,7 +4346,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated divergence of cloud ice water flux +#Time-integrated total column vertically-integrated divergence of cloud ice water flux 'tviciwd' = { discipline = 0 ; parameterCategory = 1 ; @@ -4355,7 +4355,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated divergence of rain flux +#Time-integrated total column vertically-integrated divergence of rain flux 'tvird' = { discipline = 0 ; parameterCategory = 1 ; @@ -4364,7 +4364,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated divergence of snow flux +#Time-integrated total column vertically-integrated divergence of snow flux 'tvisd' = { discipline = 0 ; parameterCategory = 1 ; @@ -4373,7 +4373,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated eastward water vapour flux +#Time-integrated total column vertically-integrated eastward water vapour flux 'tviwve' = { discipline = 0 ; parameterCategory = 1 ; @@ -4382,7 +4382,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated northward water vapour flux +#Time-integrated total column vertically-integrated northward water vapour flux 'tviwvn' = { discipline = 0 ; parameterCategory = 1 ; @@ -4391,7 +4391,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated eastward cloud liquid water flux +#Time-integrated total column vertically-integrated eastward cloud liquid water flux 'tviclwe' = { discipline = 0 ; parameterCategory = 1 ; @@ -4400,7 +4400,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated northward cloud liquid water flux +#Time-integrated total column vertically-integrated northward cloud liquid water flux 'tviclwn' = { discipline = 0 ; parameterCategory = 1 ; @@ -4409,7 +4409,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated eastward cloud ice water flux +#Time-integrated total column vertically-integrated eastward cloud ice water flux 'tviciwe' = { discipline = 0 ; parameterCategory = 1 ; @@ -4418,7 +4418,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated northward cloud ice water flux +#Time-integrated total column vertically-integrated northward cloud ice water flux 'tviciwn' = { discipline = 0 ; parameterCategory = 1 ; @@ -4427,7 +4427,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated eastward rain flux +#Time-integrated total column vertically-integrated eastward rain flux 'tvire' = { discipline = 0 ; parameterCategory = 1 ; @@ -4436,7 +4436,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated northward rain flux +#Time-integrated total column vertically-integrated northward rain flux 'tvirn' = { discipline = 0 ; parameterCategory = 1 ; @@ -4445,7 +4445,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated eastward snow flux +#Time-integrated total column vertically-integrated eastward snow flux 'tvise' = { discipline = 0 ; parameterCategory = 1 ; @@ -4454,7 +4454,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated northward snow flux +#Time-integrated total column vertically-integrated northward snow flux 'tvisn' = { discipline = 0 ; parameterCategory = 1 ; @@ -11284,7 +11284,7 @@ parameterCategory = 0 ; parameterNumber = 50 ; } -#Vertical integral of mass of atmosphere +#Total column vertically-integrated mass of atmosphere 'vima' = { discipline = 0 ; parameterCategory = 3 ; @@ -11316,7 +11316,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of potential+internal+latent energy +#Total column vertically-integrated potential+internal+latent energy 'vipile' = { discipline = 0 ; parameterCategory = 21 ; @@ -11332,7 +11332,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of eastward mass flux +#Total column vertically-integrated eastward mass flux 'vimae' = { discipline = 0 ; parameterCategory = 3 ; @@ -11340,7 +11340,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of northward mass flux +#Total column vertically-integrated northward mass flux 'viman' = { discipline = 0 ; parameterCategory = 3 ; @@ -11348,7 +11348,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of eastward kinetic energy flux +#Total column vertically-integrated eastward kinetic energy flux 'vikee' = { discipline = 0 ; parameterCategory = 21 ; @@ -11356,7 +11356,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of northward kinetic energy flux +#Total column vertically-integrated northward kinetic energy flux 'viken' = { discipline = 0 ; parameterCategory = 21 ; @@ -11364,7 +11364,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of eastward heat flux +#Total column vertically-integrated eastward heat flux 'vithee' = { discipline = 0 ; parameterCategory = 21 ; @@ -11372,7 +11372,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of northward heat flux +#Total column vertically-integrated northward heat flux 'vithen' = { discipline = 0 ; parameterCategory = 21 ; @@ -11380,7 +11380,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of eastward water vapour flux +#Total column vertically-integrated eastward water vapour flux 'viwve' = { discipline = 0 ; parameterCategory = 1 ; @@ -11388,7 +11388,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of northward water vapour flux +#Total column vertically-integrated northward water vapour flux 'viwvn' = { discipline = 0 ; parameterCategory = 1 ; @@ -11396,7 +11396,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of eastward geopotential flux +#Total column vertically-integrated eastward geopotential flux 'vige' = { discipline = 0 ; parameterCategory = 3 ; @@ -11404,7 +11404,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of northward geopotential flux +#Total column vertically-integrated northward geopotential flux 'vign' = { discipline = 0 ; parameterCategory = 3 ; @@ -11412,7 +11412,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of eastward total energy flux +#Total column vertically-integrated eastward total energy flux 'vitee' = { discipline = 0 ; parameterCategory = 21 ; @@ -11420,7 +11420,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of northward total energy flux +#Total column vertically-integrated northward total energy flux 'viten' = { discipline = 0 ; parameterCategory = 21 ; @@ -11428,7 +11428,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of eastward ozone flux +#Total column vertically-integrated eastward ozone flux 'vioze' = { discipline = 0 ; parameterCategory = 20 ; @@ -11437,7 +11437,7 @@ typeOfSecondFixedSurface = 8 ; constituentType = 0 ; } -#Vertical integral of northward ozone flux +#Total column vertically-integrated northward ozone flux 'viozn' = { discipline = 0 ; parameterCategory = 20 ; @@ -11446,7 +11446,7 @@ typeOfSecondFixedSurface = 8 ; constituentType = 0 ; } -#Vertical integral of divergence of mass flux +#Total column vertically-integrated divergence of mass flux 'vimad' = { discipline = 0 ; parameterCategory = 3 ; @@ -11454,7 +11454,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of divergence of kinetic energy flux +#Total column vertically-integrated divergence of kinetic energy flux 'viked' = { discipline = 0 ; parameterCategory = 21 ; @@ -11470,7 +11470,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of divergence of geopotential flux +#Total column vertically-integrated divergence of geopotential flux 'vigd' = { discipline = 0 ; parameterCategory = 3 ; @@ -11478,7 +11478,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of divergence of total energy flux +#Total column vertically-integrated divergence of total energy flux 'vited' = { discipline = 0 ; parameterCategory = 21 ; @@ -11486,7 +11486,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of divergence of ozone flux +#Total column vertically-integrated divergence of ozone flux 'viozd' = { discipline = 0 ; parameterCategory = 20 ; diff --git a/definitions/grib2/units.def b/definitions/grib2/units.def index 091b8b5d3..22b733ff6 100644 --- a/definitions/grib2/units.def +++ b/definitions/grib2/units.def @@ -4301,7 +4301,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time-integrated, total column vertically-integrated divergence of mass flux +#Time-integrated total column vertically-integrated divergence of mass flux 'kg m**-2' = { discipline = 0 ; parameterCategory = 3 ; @@ -4310,7 +4310,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time-integrated, total column vertically-integrated eastward mass flux +#Time-integrated total column vertically-integrated eastward mass flux 'kg m**-1' = { discipline = 0 ; parameterCategory = 3 ; @@ -4319,7 +4319,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time-integrated, total column vertically-integrated northward mass flux +#Time-integrated total column vertically-integrated northward mass flux 'kg m**-1' = { discipline = 0 ; parameterCategory = 3 ; @@ -4328,7 +4328,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated divergence of water vapour flux +#Time-integrated total column vertically-integrated divergence of water vapour flux 'kg m**-2' = { discipline = 0 ; parameterCategory = 1 ; @@ -4337,7 +4337,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated divergence of cloud liquid water flux +#Time-integrated total column vertically-integrated divergence of cloud liquid water flux 'kg m**-2' = { discipline = 0 ; parameterCategory = 1 ; @@ -4346,7 +4346,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated divergence of cloud ice water flux +#Time-integrated total column vertically-integrated divergence of cloud ice water flux 'kg m**-2' = { discipline = 0 ; parameterCategory = 1 ; @@ -4355,7 +4355,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated divergence of rain flux +#Time-integrated total column vertically-integrated divergence of rain flux 'kg m**-2' = { discipline = 0 ; parameterCategory = 1 ; @@ -4364,7 +4364,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated divergence of snow flux +#Time-integrated total column vertically-integrated divergence of snow flux 'kg m**-2' = { discipline = 0 ; parameterCategory = 1 ; @@ -4373,7 +4373,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated eastward water vapour flux +#Time-integrated total column vertically-integrated eastward water vapour flux 'kg m**-1' = { discipline = 0 ; parameterCategory = 1 ; @@ -4382,7 +4382,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated northward water vapour flux +#Time-integrated total column vertically-integrated northward water vapour flux 'kg m**-1' = { discipline = 0 ; parameterCategory = 1 ; @@ -4391,7 +4391,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated eastward cloud liquid water flux +#Time-integrated total column vertically-integrated eastward cloud liquid water flux 'kg m**-1' = { discipline = 0 ; parameterCategory = 1 ; @@ -4400,7 +4400,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated northward cloud liquid water flux +#Time-integrated total column vertically-integrated northward cloud liquid water flux 'kg m**-1' = { discipline = 0 ; parameterCategory = 1 ; @@ -4409,7 +4409,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated eastward cloud ice water flux +#Time-integrated total column vertically-integrated eastward cloud ice water flux 'kg m**-1' = { discipline = 0 ; parameterCategory = 1 ; @@ -4418,7 +4418,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated northward cloud ice water flux +#Time-integrated total column vertically-integrated northward cloud ice water flux 'kg m**-1' = { discipline = 0 ; parameterCategory = 1 ; @@ -4427,7 +4427,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated eastward rain flux +#Time-integrated total column vertically-integrated eastward rain flux 'kg m**-1' = { discipline = 0 ; parameterCategory = 1 ; @@ -4436,7 +4436,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated northward rain flux +#Time-integrated total column vertically-integrated northward rain flux 'kg m**-1' = { discipline = 0 ; parameterCategory = 1 ; @@ -4445,7 +4445,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated eastward snow flux +#Time-integrated total column vertically-integrated eastward snow flux 'kg m**-1' = { discipline = 0 ; parameterCategory = 1 ; @@ -4454,7 +4454,7 @@ typeOfSecondFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } -#Time integrated, vertically integrated northward snow flux +#Time-integrated total column vertically-integrated northward snow flux 'kg m**-1' = { discipline = 0 ; parameterCategory = 1 ; @@ -11284,7 +11284,7 @@ parameterCategory = 0 ; parameterNumber = 50 ; } -#Vertical integral of mass of atmosphere +#Total column vertically-integrated mass of atmosphere 'kg m**-2' = { discipline = 0 ; parameterCategory = 3 ; @@ -11316,7 +11316,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of potential+internal+latent energy +#Total column vertically-integrated potential+internal+latent energy 'J m**-2' = { discipline = 0 ; parameterCategory = 21 ; @@ -11332,7 +11332,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of eastward mass flux +#Total column vertically-integrated eastward mass flux 'kg m**-1 s**-1' = { discipline = 0 ; parameterCategory = 3 ; @@ -11340,7 +11340,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of northward mass flux +#Total column vertically-integrated northward mass flux 'kg m**-1 s**-1' = { discipline = 0 ; parameterCategory = 3 ; @@ -11348,7 +11348,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of eastward kinetic energy flux +#Total column vertically-integrated eastward kinetic energy flux 'W m**-1' = { discipline = 0 ; parameterCategory = 21 ; @@ -11356,7 +11356,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of northward kinetic energy flux +#Total column vertically-integrated northward kinetic energy flux 'W m**-1' = { discipline = 0 ; parameterCategory = 21 ; @@ -11364,7 +11364,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of eastward heat flux +#Total column vertically-integrated eastward heat flux 'W m**-1' = { discipline = 0 ; parameterCategory = 21 ; @@ -11372,7 +11372,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of northward heat flux +#Total column vertically-integrated northward heat flux 'W m**-1' = { discipline = 0 ; parameterCategory = 21 ; @@ -11380,7 +11380,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of eastward water vapour flux +#Total column vertically-integrated eastward water vapour flux 'kg m**-1 s**-1' = { discipline = 0 ; parameterCategory = 1 ; @@ -11388,7 +11388,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of northward water vapour flux +#Total column vertically-integrated northward water vapour flux 'kg m**-1 s**-1' = { discipline = 0 ; parameterCategory = 1 ; @@ -11396,7 +11396,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of eastward geopotential flux +#Total column vertically-integrated eastward geopotential flux 'W m**-1' = { discipline = 0 ; parameterCategory = 3 ; @@ -11404,7 +11404,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of northward geopotential flux +#Total column vertically-integrated northward geopotential flux 'W m**-1' = { discipline = 0 ; parameterCategory = 3 ; @@ -11412,7 +11412,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of eastward total energy flux +#Total column vertically-integrated eastward total energy flux 'W m**-1' = { discipline = 0 ; parameterCategory = 21 ; @@ -11420,7 +11420,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of northward total energy flux +#Total column vertically-integrated northward total energy flux 'W m**-1' = { discipline = 0 ; parameterCategory = 21 ; @@ -11428,7 +11428,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of eastward ozone flux +#Total column vertically-integrated eastward ozone flux 'kg m**-1 s**-1' = { discipline = 0 ; parameterCategory = 20 ; @@ -11437,7 +11437,7 @@ typeOfSecondFixedSurface = 8 ; constituentType = 0 ; } -#Vertical integral of northward ozone flux +#Total column vertically-integrated northward ozone flux 'kg m**-1 s**-1' = { discipline = 0 ; parameterCategory = 20 ; @@ -11446,7 +11446,7 @@ typeOfSecondFixedSurface = 8 ; constituentType = 0 ; } -#Vertical integral of divergence of mass flux +#Total column vertically-integrated divergence of mass flux 'kg m**-2 s**-1' = { discipline = 0 ; parameterCategory = 3 ; @@ -11454,7 +11454,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of divergence of kinetic energy flux +#Total column vertically-integrated divergence of kinetic energy flux 'W m**-2' = { discipline = 0 ; parameterCategory = 21 ; @@ -11470,7 +11470,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of divergence of geopotential flux +#Total column vertically-integrated divergence of geopotential flux 'W m**-2' = { discipline = 0 ; parameterCategory = 3 ; @@ -11478,7 +11478,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of divergence of total energy flux +#Total column vertically-integrated divergence of total energy flux 'W m**-2' = { discipline = 0 ; parameterCategory = 21 ; @@ -11486,7 +11486,7 @@ typeOfFirstFixedSurface = 1 ; typeOfSecondFixedSurface = 8 ; } -#Vertical integral of divergence of ozone flux +#Total column vertically-integrated divergence of ozone flux 'kg m**-2 s**-1' = { discipline = 0 ; parameterCategory = 20 ; From c79e5c92e24a855e55bca9f3ce8488d85b9e1f2c Mon Sep 17 00:00:00 2001 From: shahramn Date: Tue, 13 Aug 2024 14:13:52 +0100 Subject: [PATCH 12/27] GRIB2: Concept for productDefinitionTemplate (Robert's input) --- .../productDefinitionTemplateConcept.def | 33 ++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/definitions/grib2/productDefinitionTemplateConcept.def b/definitions/grib2/productDefinitionTemplateConcept.def index 8e61b16f0..46920f499 100644 --- a/definitions/grib2/productDefinitionTemplateConcept.def +++ b/definitions/grib2/productDefinitionTemplateConcept.def @@ -14,11 +14,42 @@ 'chemical_srcsink_deterministic_statistically_processed' = {productDefinitionTemplateNumber=78;} 'chemical_srcsink_ensemble_statistically_processed' = {productDefinitionTemplateNumber=79;} - 'aerosol_optical_deterministic_instantaneous' = {productDefinitionTemplateNumber=48;} 'aerosol_optical_ensemble_instantaneous' = {productDefinitionTemplateNumber=49;} +'aerosol_deterministic_instantaneous' = {productDefinitionTemplateNumber=50;} +'aerosol_deterministic_statistically_processed' = {productDefinitionTemplateNumber=46;} +'aerosol_ensemble_instantaneous' = {productDefinitionTemplateNumber=45;} +'aerosol_ensemble_statistically_processed' = {productDefinitionTemplateNumber=85;} + 'postproc_deterministic_instantaneous' = {productDefinitionTemplateNumber=70;} 'postproc_ensemble_instantaneous' = {productDefinitionTemplateNumber=71;} 'postproc_deterministic_statistically_processed' = {productDefinitionTemplateNumber=72;} 'postproc_ensemble_statistically_processed' = {productDefinitionTemplateNumber=73;} + +'quantile_forecast_instantaneous' = {productDefinitionTemplateNumber=86;} +'quantile_forecast_statistically_processed' = {productDefinitionTemplateNumber=87;} + +'postproc_quantile_forecast_instantaneous' = {productDefinitionTemplateNumber=89;} +'postproc_quantile_forecast_statistically_processed' = {productDefinitionTemplateNumber=90;} + +'wavespectra_list_deterministic_instantaneous' = {productDefinitionTemplateNumber=99;} +'wavespectra_list_ensemble_instantaneous' = {productDefinitionTemplateNumber=100;} + +'wavespectra_formulae_deterministic_instantaneous' = {productDefinitionTemplateNumber=101;} +'wavespectra_formulae_ensemble_instantaneous' = {productDefinitionTemplateNumber=102;} + +'waves_period_range_deterministic_instantaneous' = {productDefinitionTemplateNumber=103;} +'waves_period_range_ensemble_instantaneous' = {productDefinitionTemplateNumber=104;} + + +'referencePeriod_relation_deterministic_instantaneous' = {productDefinitionTemplateNumber=105;} +'referencePeriod_relation_ensemble_instantaneous' = {productDefinitionTemplateNumber=106;} +'referencePeriod_relation_derived_instantaneous' = {productDefinitionTemplateNumber=107;} +'referencePeriod_relation_probability_instantaneous' = {productDefinitionTemplateNumber=112;} + +'probability_forecast_instantaneous' = {productDefinitionTemplateNumber=5;} +'probability_forecast_statistically_processed' = {productDefinitionTemplateNumber=9;} + +'categorical_forecast_instantaneous' = {productDefinitionTemplateNumber=51;} +'categorical_forecast_statistically_processed' = {productDefinitionTemplateNumber=91;} From 146be3258fbca8ae9ab26430d06a3c125ff1e162 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Tue, 13 Aug 2024 13:29:38 +0000 Subject: [PATCH 13/27] ECC-1880: Revert the legacy settings --- .../grib2/localConcepts/ecmf/name.legacy.def | 42 ------------------- .../localConcepts/ecmf/paramId.legacy.def | 42 ------------------- .../localConcepts/ecmf/shortName.legacy.def | 42 ------------------- .../grib2/localConcepts/ecmf/units.legacy.def | 42 ------------------- 4 files changed, 168 deletions(-) diff --git a/definitions/grib2/localConcepts/ecmf/name.legacy.def b/definitions/grib2/localConcepts/ecmf/name.legacy.def index 7d8d36d0f..28b2586ef 100644 --- a/definitions/grib2/localConcepts/ecmf/name.legacy.def +++ b/definitions/grib2/localConcepts/ecmf/name.legacy.def @@ -1777,45 +1777,3 @@ parameterCategory = 140 ; parameterNumber = 254 ; } -#Magnitude of turbulent surface stress -'Magnitude of turbulent surface stress' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 48 ; -} -#Mean large-scale precipitation fraction -'Mean large-scale precipitation fraction' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 50 ; -} -#Boundary layer dissipation -'Boundary layer dissipation' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 145 ; -} -#Mean sunshine duration rate -'Mean sunshine duration rate' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 189 ; -} -#Longitudinal component of gravity wave stress -'Longitudinal component of gravity wave stress' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 195 ; -} -#Meridional component of gravity wave stress -'Meridional component of gravity wave stress' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 196 ; -} -#Gravity wave dissipation -'Gravity wave dissipation' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 197 ; -} diff --git a/definitions/grib2/localConcepts/ecmf/paramId.legacy.def b/definitions/grib2/localConcepts/ecmf/paramId.legacy.def index 4d746c798..df813254f 100644 --- a/definitions/grib2/localConcepts/ecmf/paramId.legacy.def +++ b/definitions/grib2/localConcepts/ecmf/paramId.legacy.def @@ -1777,45 +1777,3 @@ parameterCategory = 140 ; parameterNumber = 254 ; } -#Magnitude of turbulent surface stress -'172048' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 48 ; -} -#Mean large-scale precipitation fraction -'172050' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 50 ; -} -#Boundary layer dissipation -'172145' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 145 ; -} -#Mean sunshine duration rate -'172189' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 189 ; -} -#Longitudinal component of gravity wave stress -'172195' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 195 ; -} -#Meridional component of gravity wave stress -'172196' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 196 ; -} -#Gravity wave dissipation -'172197' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 197 ; -} diff --git a/definitions/grib2/localConcepts/ecmf/shortName.legacy.def b/definitions/grib2/localConcepts/ecmf/shortName.legacy.def index c954c06c9..498f6a3c1 100644 --- a/definitions/grib2/localConcepts/ecmf/shortName.legacy.def +++ b/definitions/grib2/localConcepts/ecmf/shortName.legacy.def @@ -1777,45 +1777,3 @@ parameterCategory = 140 ; parameterNumber = 254 ; } -#Magnitude of turbulent surface stress -'~' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 48 ; -} -#Mean large-scale precipitation fraction -'mlspfr' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 50 ; -} -#Boundary layer dissipation -'bldrate' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 145 ; -} -#Mean sunshine duration rate -'msdr' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 189 ; -} -#Longitudinal component of gravity wave stress -'~' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 195 ; -} -#Meridional component of gravity wave stress -'~' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 196 ; -} -#Gravity wave dissipation -'gwdrate' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 197 ; -} diff --git a/definitions/grib2/localConcepts/ecmf/units.legacy.def b/definitions/grib2/localConcepts/ecmf/units.legacy.def index 953b96cc0..d7675c4d6 100644 --- a/definitions/grib2/localConcepts/ecmf/units.legacy.def +++ b/definitions/grib2/localConcepts/ecmf/units.legacy.def @@ -1777,45 +1777,3 @@ parameterCategory = 140 ; parameterNumber = 254 ; } -#Magnitude of turbulent surface stress -'N m**-2' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 48 ; -} -#Mean large-scale precipitation fraction -'~' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 50 ; -} -#Boundary layer dissipation -'W m**-2' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 145 ; -} -#Mean sunshine duration rate -'s s**-1' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 189 ; -} -#Longitudinal component of gravity wave stress -'N m**-2' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 195 ; -} -#Meridional component of gravity wave stress -'N m**-2' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 196 ; -} -#Gravity wave dissipation -'W m**-2' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 197 ; -} From 14986da02c3c7a21e54b9392b846459f1530458f Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Tue, 13 Aug 2024 14:57:08 +0000 Subject: [PATCH 14/27] ECC-1880: GRIB2: Additions & modifications of instantaneous parameters for generalised time processing approach (part 5) --- definitions/grib1/localConcepts/ecmf/name.def | 5 -- .../grib1/localConcepts/ecmf/paramId.def | 5 -- .../grib1/localConcepts/ecmf/shortName.def | 5 -- .../grib1/localConcepts/ecmf/units.def | 5 -- definitions/grib2/localConcepts/ecmf/name.def | 54 ------------------- .../grib2/localConcepts/ecmf/paramId.def | 54 ------------------- .../grib2/localConcepts/ecmf/shortName.def | 54 ------------------- .../grib2/localConcepts/ecmf/units.def | 54 ------------------- definitions/grib2/name.def | 12 ----- definitions/grib2/paramId.def | 12 ----- definitions/grib2/shortName.def | 12 ----- definitions/grib2/units.def | 12 ----- 12 files changed, 284 deletions(-) diff --git a/definitions/grib1/localConcepts/ecmf/name.def b/definitions/grib1/localConcepts/ecmf/name.def index eb319acb5..07bd12578 100644 --- a/definitions/grib1/localConcepts/ecmf/name.def +++ b/definitions/grib1/localConcepts/ecmf/name.def @@ -14984,11 +14984,6 @@ table2Version = 172 ; indicatorOfParameter = 45 ; } -#Magnitude of turbulent surface stress -'Magnitude of turbulent surface stress' = { - table2Version = 172 ; - indicatorOfParameter = 48 ; - } #Mean large-scale precipitation fraction 'Mean large-scale precipitation fraction' = { table2Version = 172 ; diff --git a/definitions/grib1/localConcepts/ecmf/paramId.def b/definitions/grib1/localConcepts/ecmf/paramId.def index 6301ec4ff..3347f26b7 100644 --- a/definitions/grib1/localConcepts/ecmf/paramId.def +++ b/definitions/grib1/localConcepts/ecmf/paramId.def @@ -14984,11 +14984,6 @@ table2Version = 172 ; indicatorOfParameter = 45 ; } -#Magnitude of turbulent surface stress -'172048' = { - table2Version = 172 ; - indicatorOfParameter = 48 ; - } #Mean large-scale precipitation fraction '172050' = { table2Version = 172 ; diff --git a/definitions/grib1/localConcepts/ecmf/shortName.def b/definitions/grib1/localConcepts/ecmf/shortName.def index c7fde21ea..fb32662bd 100644 --- a/definitions/grib1/localConcepts/ecmf/shortName.def +++ b/definitions/grib1/localConcepts/ecmf/shortName.def @@ -14984,11 +14984,6 @@ table2Version = 172 ; indicatorOfParameter = 45 ; } -#Magnitude of turbulent surface stress -'~' = { - table2Version = 172 ; - indicatorOfParameter = 48 ; - } #Mean large-scale precipitation fraction 'mlspfr' = { table2Version = 172 ; diff --git a/definitions/grib1/localConcepts/ecmf/units.def b/definitions/grib1/localConcepts/ecmf/units.def index ae33fd2ee..6ec4e8064 100644 --- a/definitions/grib1/localConcepts/ecmf/units.def +++ b/definitions/grib1/localConcepts/ecmf/units.def @@ -14984,11 +14984,6 @@ table2Version = 172 ; indicatorOfParameter = 45 ; } -#Magnitude of turbulent surface stress -'N m**-2' = { - table2Version = 172 ; - indicatorOfParameter = 48 ; - } #Mean large-scale precipitation fraction '~' = { table2Version = 172 ; diff --git a/definitions/grib2/localConcepts/ecmf/name.def b/definitions/grib2/localConcepts/ecmf/name.def index 1e390741a..8d00d429a 100644 --- a/definitions/grib2/localConcepts/ecmf/name.def +++ b/definitions/grib2/localConcepts/ecmf/name.def @@ -266,18 +266,6 @@ parameterCategory = 128 ; parameterNumber = 71 ; } -#Instantaneous surface solar radiation downwards -'Instantaneous surface solar radiation downwards' = { - discipline = 192 ; - parameterCategory = 128 ; - parameterNumber = 72 ; - } -#Instantaneous surface thermal radiation downwards -'Instantaneous surface thermal radiation downwards' = { - discipline = 192 ; - parameterCategory = 128 ; - parameterNumber = 73 ; - } #Experimental product 'Experimental product' = { discipline = 192 ; @@ -18782,18 +18770,6 @@ parameterCategory = 172 ; parameterNumber = 45 ; } -#Magnitude of turbulent surface stress -'Magnitude of turbulent surface stress' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 48 ; - } -#Mean large-scale precipitation fraction -'Mean large-scale precipitation fraction' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 50 ; - } #Mean large-scale precipitation rate 'Mean large-scale precipitation rate' = { localTablesVersion = 1 ; @@ -18821,12 +18797,6 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 0 ; } -#Boundary layer dissipation -'Boundary layer dissipation' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 145 ; - } #Mean short-wave heating rate 'Mean short-wave heating rate' = { discipline = 192 ; @@ -18848,30 +18818,6 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 0 ; } -#Mean sunshine duration rate -'Mean sunshine duration rate' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 189 ; - } -#Longitudinal component of gravity wave stress -'Longitudinal component of gravity wave stress' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 195 ; - } -#Meridional component of gravity wave stress -'Meridional component of gravity wave stress' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 196 ; - } -#Gravity wave dissipation -'Gravity wave dissipation' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 197 ; - } #Mean runoff rate 'Mean runoff rate' = { localTablesVersion = 1 ; diff --git a/definitions/grib2/localConcepts/ecmf/paramId.def b/definitions/grib2/localConcepts/ecmf/paramId.def index ab184ae4d..b4e5a0c5f 100644 --- a/definitions/grib2/localConcepts/ecmf/paramId.def +++ b/definitions/grib2/localConcepts/ecmf/paramId.def @@ -266,18 +266,6 @@ parameterCategory = 128 ; parameterNumber = 71 ; } -#Instantaneous surface solar radiation downwards -'72' = { - discipline = 192 ; - parameterCategory = 128 ; - parameterNumber = 72 ; - } -#Instantaneous surface thermal radiation downwards -'73' = { - discipline = 192 ; - parameterCategory = 128 ; - parameterNumber = 73 ; - } #Experimental product '80' = { discipline = 192 ; @@ -18782,18 +18770,6 @@ parameterCategory = 172 ; parameterNumber = 45 ; } -#Magnitude of turbulent surface stress -'172048' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 48 ; - } -#Mean large-scale precipitation fraction -'172050' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 50 ; - } #Mean large-scale precipitation rate '172142' = { localTablesVersion = 1 ; @@ -18821,12 +18797,6 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 0 ; } -#Boundary layer dissipation -'172145' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 145 ; - } #Mean short-wave heating rate '172153' = { discipline = 192 ; @@ -18848,30 +18818,6 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 0 ; } -#Mean sunshine duration rate -'172189' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 189 ; - } -#Longitudinal component of gravity wave stress -'172195' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 195 ; - } -#Meridional component of gravity wave stress -'172196' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 196 ; - } -#Gravity wave dissipation -'172197' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 197 ; - } #Mean runoff rate '172205' = { localTablesVersion = 1 ; diff --git a/definitions/grib2/localConcepts/ecmf/shortName.def b/definitions/grib2/localConcepts/ecmf/shortName.def index e5fa627d0..2f124dd73 100644 --- a/definitions/grib2/localConcepts/ecmf/shortName.def +++ b/definitions/grib2/localConcepts/ecmf/shortName.def @@ -266,18 +266,6 @@ parameterCategory = 128 ; parameterNumber = 71 ; } -#Instantaneous surface solar radiation downwards -'issrd' = { - discipline = 192 ; - parameterCategory = 128 ; - parameterNumber = 72 ; - } -#Instantaneous surface thermal radiation downwards -'istrd' = { - discipline = 192 ; - parameterCategory = 128 ; - parameterNumber = 73 ; - } #Experimental product '~' = { discipline = 192 ; @@ -18782,18 +18770,6 @@ parameterCategory = 172 ; parameterNumber = 45 ; } -#Magnitude of turbulent surface stress -'~' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 48 ; - } -#Mean large-scale precipitation fraction -'mlspfr' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 50 ; - } #Mean large-scale precipitation rate 'mlsprt' = { localTablesVersion = 1 ; @@ -18821,12 +18797,6 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 0 ; } -#Boundary layer dissipation -'bldrate' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 145 ; - } #Mean short-wave heating rate 'mswhr' = { discipline = 192 ; @@ -18848,30 +18818,6 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 0 ; } -#Mean sunshine duration rate -'msdr' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 189 ; - } -#Longitudinal component of gravity wave stress -'~' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 195 ; - } -#Meridional component of gravity wave stress -'~' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 196 ; - } -#Gravity wave dissipation -'gwdrate' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 197 ; - } #Mean runoff rate 'mrort' = { localTablesVersion = 1 ; diff --git a/definitions/grib2/localConcepts/ecmf/units.def b/definitions/grib2/localConcepts/ecmf/units.def index 7931fee09..c8c65ba8a 100644 --- a/definitions/grib2/localConcepts/ecmf/units.def +++ b/definitions/grib2/localConcepts/ecmf/units.def @@ -266,18 +266,6 @@ parameterCategory = 128 ; parameterNumber = 71 ; } -#Instantaneous surface solar radiation downwards -'W m**-2' = { - discipline = 192 ; - parameterCategory = 128 ; - parameterNumber = 72 ; - } -#Instantaneous surface thermal radiation downwards -'W m**-2' = { - discipline = 192 ; - parameterCategory = 128 ; - parameterNumber = 73 ; - } #Experimental product '~' = { discipline = 192 ; @@ -18782,18 +18770,6 @@ parameterCategory = 172 ; parameterNumber = 45 ; } -#Magnitude of turbulent surface stress -'N m**-2' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 48 ; - } -#Mean large-scale precipitation fraction -'~' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 50 ; - } #Mean large-scale precipitation rate 'm s**-1' = { localTablesVersion = 1 ; @@ -18821,12 +18797,6 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 0 ; } -#Boundary layer dissipation -'W m**-2' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 145 ; - } #Mean short-wave heating rate 'K s**-1' = { discipline = 192 ; @@ -18848,30 +18818,6 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 0 ; } -#Mean sunshine duration rate -'s s**-1' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 189 ; - } -#Longitudinal component of gravity wave stress -'N m**-2' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 195 ; - } -#Meridional component of gravity wave stress -'N m**-2' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 196 ; - } -#Gravity wave dissipation -'W m**-2' = { - discipline = 192 ; - parameterCategory = 172 ; - parameterNumber = 197 ; - } #Mean runoff rate 'm s**-1' = { localTablesVersion = 1 ; diff --git a/definitions/grib2/name.def b/definitions/grib2/name.def index 56d6adccc..ba2128aa3 100644 --- a/definitions/grib2/name.def +++ b/definitions/grib2/name.def @@ -6441,18 +6441,6 @@ parameterCategory = 4 ; parameterNumber = 51 ; } -#Net long wave radiation flux (surface) -'Net long wave radiation flux (surface)' = { - discipline = 0 ; - parameterCategory = 5 ; - parameterNumber = 0 ; - } -#Net long wave radiation flux (top of atmosphere) -'Net long wave radiation flux (top of atmosphere)' = { - discipline = 0 ; - parameterCategory = 5 ; - parameterNumber = 1 ; - } #Surface downward long-wave radiation flux 'Surface downward long-wave radiation flux' = { discipline = 0 ; diff --git a/definitions/grib2/paramId.def b/definitions/grib2/paramId.def index 6d5c38537..559dfa569 100644 --- a/definitions/grib2/paramId.def +++ b/definitions/grib2/paramId.def @@ -6441,18 +6441,6 @@ parameterCategory = 4 ; parameterNumber = 51 ; } -#Net long wave radiation flux (surface) -'260095' = { - discipline = 0 ; - parameterCategory = 5 ; - parameterNumber = 0 ; - } -#Net long wave radiation flux (top of atmosphere) -'260096' = { - discipline = 0 ; - parameterCategory = 5 ; - parameterNumber = 1 ; - } #Surface downward long-wave radiation flux '260097' = { discipline = 0 ; diff --git a/definitions/grib2/shortName.def b/definitions/grib2/shortName.def index 78d215c1c..d3938a656 100644 --- a/definitions/grib2/shortName.def +++ b/definitions/grib2/shortName.def @@ -6441,18 +6441,6 @@ parameterCategory = 4 ; parameterNumber = 51 ; } -#Net long wave radiation flux (surface) -'nlwrs' = { - discipline = 0 ; - parameterCategory = 5 ; - parameterNumber = 0 ; - } -#Net long wave radiation flux (top of atmosphere) -'nlwrt' = { - discipline = 0 ; - parameterCategory = 5 ; - parameterNumber = 1 ; - } #Surface downward long-wave radiation flux 'sdlwrf' = { discipline = 0 ; diff --git a/definitions/grib2/units.def b/definitions/grib2/units.def index 22b733ff6..d71fda3c2 100644 --- a/definitions/grib2/units.def +++ b/definitions/grib2/units.def @@ -6441,18 +6441,6 @@ parameterCategory = 4 ; parameterNumber = 51 ; } -#Net long wave radiation flux (surface) -'W m**-2' = { - discipline = 0 ; - parameterCategory = 5 ; - parameterNumber = 0 ; - } -#Net long wave radiation flux (top of atmosphere) -'W m**-2' = { - discipline = 0 ; - parameterCategory = 5 ; - parameterNumber = 1 ; - } #Surface downward long-wave radiation flux 'W m**-2' = { discipline = 0 ; From d9af67b46a331ab3ad4e0103074eafe5a0e9ebe4 Mon Sep 17 00:00:00 2001 From: shahramn Date: Tue, 13 Aug 2024 16:24:02 +0100 Subject: [PATCH 15/27] ECC-1880: Conversion from grib1 to grib2 --- .../grib1/localConcepts/ecmf/paramIdForConversion.def | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/definitions/grib1/localConcepts/ecmf/paramIdForConversion.def b/definitions/grib1/localConcepts/ecmf/paramIdForConversion.def index 07b7d5a83..050690c5c 100644 --- a/definitions/grib1/localConcepts/ecmf/paramIdForConversion.def +++ b/definitions/grib1/localConcepts/ecmf/paramIdForConversion.def @@ -35,3 +35,11 @@ 262139 = {gribTablesVersionNo=151; indicatorOfParameter=132; centre=98;} # 151131 262140 = {gribTablesVersionNo=151; indicatorOfParameter=131; centre=98;} +# +260087 = {gribTablesVersionNo=128; indicatorOfParameter=72; centre=98;} +260097 = {gribTablesVersionNo=128; indicatorOfParameter=73; centre=98;} +235026 = {gribTablesVersionNo=172; indicatorOfParameter=50; centre=98;} +235032 = {gribTablesVersionNo=172; indicatorOfParameter=145; centre=98;} +235045 = {gribTablesVersionNo=172; indicatorOfParameter=195; centre=98;} +235046 = {gribTablesVersionNo=172; indicatorOfParameter=196; centre=98;} +235047 = {gribTablesVersionNo=172; indicatorOfParameter=197; centre=98;} From 92fc7c938ab4b96cb9b4d309c5237c5e5dfda2be Mon Sep 17 00:00:00 2001 From: shahramn Date: Tue, 13 Aug 2024 16:32:01 +0100 Subject: [PATCH 16/27] ECC-1880: Conversion from grib1 to grib2 --- tests/grib_ecc-1806.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/grib_ecc-1806.sh b/tests/grib_ecc-1806.sh index e08f667a6..f512ff5c4 100755 --- a/tests/grib_ecc-1806.sh +++ b/tests/grib_ecc-1806.sh @@ -55,5 +55,8 @@ test_conversion 172178 235039 mtnswrf test_conversion 172179 235040 mtnlwrf test_conversion 151175 262118 sc300m +test_conversion 72 260087 sdswrf +test_conversion 73 260097 sdlwrf + # Clean up rm -f $tempGrib1 $tempGrib2 $tempLog From d1835db760264747c5912529e0be045a5f959230 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Tue, 13 Aug 2024 16:54:07 +0000 Subject: [PATCH 17/27] Unused data member --- src/accessor/grib_accessor_class_g2date.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/accessor/grib_accessor_class_g2date.h b/src/accessor/grib_accessor_class_g2date.h index e6981665c..b1676bcd2 100644 --- a/src/accessor/grib_accessor_class_g2date.h +++ b/src/accessor/grib_accessor_class_g2date.h @@ -17,7 +17,6 @@ class grib_accessor_g2date_t : public grib_accessor_long_t { public: /* Members defined in g2date */ - const char* century; const char* year; const char* month; const char* day; From 55e8fe9ab3ce5c9a558f6738eb277340dce63ecf Mon Sep 17 00:00:00 2001 From: shahramn Date: Tue, 13 Aug 2024 20:03:08 +0100 Subject: [PATCH 18/27] Testing: productDefinitionTemplate concept uniqueness --- tests/CMakeLists.txt | 1 + tests/grib2_product_templates.sh | 58 ++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100755 tests/grib2_product_templates.sh diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index dfb3799b5..d4fc34dbf 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -164,6 +164,7 @@ if( HAVE_BUILD_TOOLS ) grib_spectral grib_levtype grib_typeOfLevel + grib2_product_templates grib_grid_unstructured grib_grid_lambert_conformal grib_grid_polar_stereographic diff --git a/tests/grib2_product_templates.sh b/tests/grib2_product_templates.sh new file mode 100755 index 000000000..29e70a96c --- /dev/null +++ b/tests/grib2_product_templates.sh @@ -0,0 +1,58 @@ +#!/bin/sh +# (C) Copyright 2005- ECMWF. +# +# This software is licensed under the terms of the Apache Licence Version 2.0 +# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. +# +# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by +# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction. +# + +. ./include.ctest.sh + +label="grib2_product_templates_test" +tempText=temp.$label.txt +tempGribA=temp.$label.A.grib +tempGribB=temp.$label.B.grib + +if [ ! -d "$ECCODES_DEFINITION_PATH" ]; then + echo "Test $0 disabled. No definitions directory" + exit 0 +fi + +sample_g2=$ECCODES_SAMPLES_PATH/GRIB2.tmpl +def_file="$ECCODES_DEFINITION_PATH/grib2/productDefinitionTemplateConcept.def" + +# Ensure all productDefinitionTemplateNumber values are unique +# ------------------------------------------------------------ +rm -f $tempText + +# uniq -d outputs a single copy of each line that is repeated in the input +awk -F= '$0 ~ /product/ {print $3}' $def_file | tr -d ';} ' | sort -n | uniq -d > $tempText + +if [ -s "$tempText" ]; then + # File exists and has a size greater than zero + echo "ERROR: Duplicate PDT number found in $def_file" >&2 + cat $tempText + exit 1 +else + echo "No duplicates in $def_file" +fi + +# Ensure all strings are unique +# ------------------------------ +rm -f $tempText +grep "^'" $def_file | awk -F= '{print $1}' | tr -d "' " | sort | uniq -d > $tempText +cat $tempText +if [ -s "$tempText" ]; then + # File exists and has a size greater than zero + echo "ERROR: Duplicate string found in $def_file" >&2 + cat $tempText + exit 1 +else + echo "No duplicates in $def_file" +fi + + +# Clean up +rm -f $tempText $tempGribA $tempGribB From caced72efc30140d704f02915bbd725dfa2dd557 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Wed, 14 Aug 2024 08:55:42 +0000 Subject: [PATCH 19/27] ECC-1901: GRIB2: remove is_chemical from ERA6 pseudo-centre parameters --- definitions/grib2/localConcepts/era6/name.def | 13 ------------- definitions/grib2/localConcepts/era6/paramId.def | 13 ------------- definitions/grib2/localConcepts/era6/shortName.def | 13 ------------- definitions/grib2/localConcepts/era6/units.def | 13 ------------- 4 files changed, 52 deletions(-) diff --git a/definitions/grib2/localConcepts/era6/name.def b/definitions/grib2/localConcepts/era6/name.def index b8857e1c1..635f9c0da 100644 --- a/definitions/grib2/localConcepts/era6/name.def +++ b/definitions/grib2/localConcepts/era6/name.def @@ -330,7 +330,6 @@ parameterNumber = 59 ; constituentType = 3 ; typeOfStatisticalProcessing = 1 ; - is_chemical = 1 ; } #Accumulated Carbon Dioxide Gross Primary Production 'Accumulated Carbon Dioxide Gross Primary Production' = { @@ -339,7 +338,6 @@ parameterNumber = 60 ; constituentType = 3 ; typeOfStatisticalProcessing = 1 ; - is_chemical = 1 ; } #Accumulated Carbon Dioxide Ecosystem Respiration 'Accumulated Carbon Dioxide Ecosystem Respiration' = { @@ -348,7 +346,6 @@ parameterNumber = 61 ; constituentType = 3 ; typeOfStatisticalProcessing = 1 ; - is_chemical = 1 ; } #Carbon dioxide net ecosystem exchange flux 'Carbon dioxide net ecosystem exchange flux' = { @@ -356,7 +353,6 @@ parameterCategory = 0 ; parameterNumber = 59 ; constituentType = 3 ; - is_chemical = 1 ; } #Carbon dioxide gross primary production flux 'Carbon dioxide gross primary production flux' = { @@ -364,7 +360,6 @@ parameterCategory = 0 ; parameterNumber = 60 ; constituentType = 3 ; - is_chemical = 1 ; } #Carbon dioxide ecosystem respiration flux 'Carbon dioxide ecosystem respiration flux' = { @@ -372,7 +367,6 @@ parameterCategory = 0 ; parameterNumber = 61 ; constituentType = 3 ; - is_chemical = 1 ; } #Accumulated freezing rain 'Accumulated freezing rain' = { @@ -401,7 +395,6 @@ typeOfSecondFixedSurface = 8 ; constituentType = 0 ; typeOfStatisticalProcessing = 1 ; - is_chemical = 1 ; } #Time-integrated total column vertically-integrated northward ozone flux 'Time-integrated total column vertically-integrated northward ozone flux' = { @@ -412,7 +405,6 @@ typeOfSecondFixedSurface = 8 ; constituentType = 0 ; typeOfStatisticalProcessing = 1 ; - is_chemical = 1 ; } #Time-integrated total column vertically-integrated divergence of ozone flux 'Time-integrated total column vertically-integrated divergence of ozone flux' = { @@ -423,7 +415,6 @@ typeOfSecondFixedSurface = 8 ; constituentType = 0 ; typeOfStatisticalProcessing = 1 ; - is_chemical = 1 ; } #Time-integrated total column vertically-integrated net source of ozone 'Time-integrated total column vertically-integrated net source of ozone' = { @@ -434,7 +425,6 @@ typeOfSecondFixedSurface = 8 ; constituentType = 0 ; typeOfStatisticalProcessing = 1 ; - is_chemical = 1 ; } #Mean carbon dioxide net ecosystem exchange flux 'Mean carbon dioxide net ecosystem exchange flux' = { @@ -443,7 +433,6 @@ parameterNumber = 59 ; constituentType = 3 ; typeOfStatisticalProcessing = 0 ; - is_chemical = 1 ; } #Mean carbon dioxide gross primary production flux 'Mean carbon dioxide gross primary production flux' = { @@ -452,7 +441,6 @@ parameterNumber = 60 ; constituentType = 3 ; typeOfStatisticalProcessing = 0 ; - is_chemical = 1 ; } #Mean carbon dioxide ecosystem respiration flux 'Mean carbon dioxide ecosystem respiration flux' = { @@ -461,7 +449,6 @@ parameterNumber = 61 ; constituentType = 3 ; typeOfStatisticalProcessing = 0 ; - is_chemical = 1 ; } #Time-mean logarithm of surface pressure 'Time-mean logarithm of surface pressure' = { diff --git a/definitions/grib2/localConcepts/era6/paramId.def b/definitions/grib2/localConcepts/era6/paramId.def index b288a4d9e..2e1ceceb7 100644 --- a/definitions/grib2/localConcepts/era6/paramId.def +++ b/definitions/grib2/localConcepts/era6/paramId.def @@ -330,7 +330,6 @@ parameterNumber = 59 ; constituentType = 3 ; typeOfStatisticalProcessing = 1 ; - is_chemical = 1 ; } #Accumulated Carbon Dioxide Gross Primary Production '228081' = { @@ -339,7 +338,6 @@ parameterNumber = 60 ; constituentType = 3 ; typeOfStatisticalProcessing = 1 ; - is_chemical = 1 ; } #Accumulated Carbon Dioxide Ecosystem Respiration '228082' = { @@ -348,7 +346,6 @@ parameterNumber = 61 ; constituentType = 3 ; typeOfStatisticalProcessing = 1 ; - is_chemical = 1 ; } #Carbon dioxide net ecosystem exchange flux '228083' = { @@ -356,7 +353,6 @@ parameterCategory = 0 ; parameterNumber = 59 ; constituentType = 3 ; - is_chemical = 1 ; } #Carbon dioxide gross primary production flux '228084' = { @@ -364,7 +360,6 @@ parameterCategory = 0 ; parameterNumber = 60 ; constituentType = 3 ; - is_chemical = 1 ; } #Carbon dioxide ecosystem respiration flux '228085' = { @@ -372,7 +367,6 @@ parameterCategory = 0 ; parameterNumber = 61 ; constituentType = 3 ; - is_chemical = 1 ; } #Accumulated freezing rain '228216' = { @@ -401,7 +395,6 @@ typeOfSecondFixedSurface = 8 ; constituentType = 0 ; typeOfStatisticalProcessing = 1 ; - is_chemical = 1 ; } #Time-integrated total column vertically-integrated northward ozone flux '233033' = { @@ -412,7 +405,6 @@ typeOfSecondFixedSurface = 8 ; constituentType = 0 ; typeOfStatisticalProcessing = 1 ; - is_chemical = 1 ; } #Time-integrated total column vertically-integrated divergence of ozone flux '233034' = { @@ -423,7 +415,6 @@ typeOfSecondFixedSurface = 8 ; constituentType = 0 ; typeOfStatisticalProcessing = 1 ; - is_chemical = 1 ; } #Time-integrated total column vertically-integrated net source of ozone '233035' = { @@ -434,7 +425,6 @@ typeOfSecondFixedSurface = 8 ; constituentType = 0 ; typeOfStatisticalProcessing = 1 ; - is_chemical = 1 ; } #Mean carbon dioxide net ecosystem exchange flux '235062' = { @@ -443,7 +433,6 @@ parameterNumber = 59 ; constituentType = 3 ; typeOfStatisticalProcessing = 0 ; - is_chemical = 1 ; } #Mean carbon dioxide gross primary production flux '235063' = { @@ -452,7 +441,6 @@ parameterNumber = 60 ; constituentType = 3 ; typeOfStatisticalProcessing = 0 ; - is_chemical = 1 ; } #Mean carbon dioxide ecosystem respiration flux '235064' = { @@ -461,7 +449,6 @@ parameterNumber = 61 ; constituentType = 3 ; typeOfStatisticalProcessing = 0 ; - is_chemical = 1 ; } #Time-mean logarithm of surface pressure '235152' = { diff --git a/definitions/grib2/localConcepts/era6/shortName.def b/definitions/grib2/localConcepts/era6/shortName.def index 02dd1e85c..769ddfe09 100644 --- a/definitions/grib2/localConcepts/era6/shortName.def +++ b/definitions/grib2/localConcepts/era6/shortName.def @@ -330,7 +330,6 @@ parameterNumber = 59 ; constituentType = 3 ; typeOfStatisticalProcessing = 1 ; - is_chemical = 1 ; } #Accumulated Carbon Dioxide Gross Primary Production 'aco2gpp' = { @@ -339,7 +338,6 @@ parameterNumber = 60 ; constituentType = 3 ; typeOfStatisticalProcessing = 1 ; - is_chemical = 1 ; } #Accumulated Carbon Dioxide Ecosystem Respiration 'aco2rec' = { @@ -348,7 +346,6 @@ parameterNumber = 61 ; constituentType = 3 ; typeOfStatisticalProcessing = 1 ; - is_chemical = 1 ; } #Carbon dioxide net ecosystem exchange flux 'fco2nee' = { @@ -356,7 +353,6 @@ parameterCategory = 0 ; parameterNumber = 59 ; constituentType = 3 ; - is_chemical = 1 ; } #Carbon dioxide gross primary production flux 'fco2gpp' = { @@ -364,7 +360,6 @@ parameterCategory = 0 ; parameterNumber = 60 ; constituentType = 3 ; - is_chemical = 1 ; } #Carbon dioxide ecosystem respiration flux 'fco2rec' = { @@ -372,7 +367,6 @@ parameterCategory = 0 ; parameterNumber = 61 ; constituentType = 3 ; - is_chemical = 1 ; } #Accumulated freezing rain 'fzra' = { @@ -401,7 +395,6 @@ typeOfSecondFixedSurface = 8 ; constituentType = 0 ; typeOfStatisticalProcessing = 1 ; - is_chemical = 1 ; } #Time-integrated total column vertically-integrated northward ozone flux 'tviozn' = { @@ -412,7 +405,6 @@ typeOfSecondFixedSurface = 8 ; constituentType = 0 ; typeOfStatisticalProcessing = 1 ; - is_chemical = 1 ; } #Time-integrated total column vertically-integrated divergence of ozone flux 'tviozd' = { @@ -423,7 +415,6 @@ typeOfSecondFixedSurface = 8 ; constituentType = 0 ; typeOfStatisticalProcessing = 1 ; - is_chemical = 1 ; } #Time-integrated total column vertically-integrated net source of ozone 'tvions' = { @@ -434,7 +425,6 @@ typeOfSecondFixedSurface = 8 ; constituentType = 0 ; typeOfStatisticalProcessing = 1 ; - is_chemical = 1 ; } #Mean carbon dioxide net ecosystem exchange flux 'mcdneef' = { @@ -443,7 +433,6 @@ parameterNumber = 59 ; constituentType = 3 ; typeOfStatisticalProcessing = 0 ; - is_chemical = 1 ; } #Mean carbon dioxide gross primary production flux 'mcdgppf' = { @@ -452,7 +441,6 @@ parameterNumber = 60 ; constituentType = 3 ; typeOfStatisticalProcessing = 0 ; - is_chemical = 1 ; } #Mean carbon dioxide ecosystem respiration flux 'mcderf' = { @@ -461,7 +449,6 @@ parameterNumber = 61 ; constituentType = 3 ; typeOfStatisticalProcessing = 0 ; - is_chemical = 1 ; } #Time-mean logarithm of surface pressure 'avg_lnsp' = { diff --git a/definitions/grib2/localConcepts/era6/units.def b/definitions/grib2/localConcepts/era6/units.def index f6cb25b31..ada2d609f 100644 --- a/definitions/grib2/localConcepts/era6/units.def +++ b/definitions/grib2/localConcepts/era6/units.def @@ -330,7 +330,6 @@ parameterNumber = 59 ; constituentType = 3 ; typeOfStatisticalProcessing = 1 ; - is_chemical = 1 ; } #Accumulated Carbon Dioxide Gross Primary Production 'kg m**-2' = { @@ -339,7 +338,6 @@ parameterNumber = 60 ; constituentType = 3 ; typeOfStatisticalProcessing = 1 ; - is_chemical = 1 ; } #Accumulated Carbon Dioxide Ecosystem Respiration 'kg m**-2' = { @@ -348,7 +346,6 @@ parameterNumber = 61 ; constituentType = 3 ; typeOfStatisticalProcessing = 1 ; - is_chemical = 1 ; } #Carbon dioxide net ecosystem exchange flux 'kg m**-2 s**-1' = { @@ -356,7 +353,6 @@ parameterCategory = 0 ; parameterNumber = 59 ; constituentType = 3 ; - is_chemical = 1 ; } #Carbon dioxide gross primary production flux 'kg m**-2 s**-1' = { @@ -364,7 +360,6 @@ parameterCategory = 0 ; parameterNumber = 60 ; constituentType = 3 ; - is_chemical = 1 ; } #Carbon dioxide ecosystem respiration flux 'kg m**-2 s**-1' = { @@ -372,7 +367,6 @@ parameterCategory = 0 ; parameterNumber = 61 ; constituentType = 3 ; - is_chemical = 1 ; } #Accumulated freezing rain 'm' = { @@ -401,7 +395,6 @@ typeOfSecondFixedSurface = 8 ; constituentType = 0 ; typeOfStatisticalProcessing = 1 ; - is_chemical = 1 ; } #Time-integrated total column vertically-integrated northward ozone flux 'kg m**-1' = { @@ -412,7 +405,6 @@ typeOfSecondFixedSurface = 8 ; constituentType = 0 ; typeOfStatisticalProcessing = 1 ; - is_chemical = 1 ; } #Time-integrated total column vertically-integrated divergence of ozone flux 'kg m**-2' = { @@ -423,7 +415,6 @@ typeOfSecondFixedSurface = 8 ; constituentType = 0 ; typeOfStatisticalProcessing = 1 ; - is_chemical = 1 ; } #Time-integrated total column vertically-integrated net source of ozone 'kg m**-2' = { @@ -434,7 +425,6 @@ typeOfSecondFixedSurface = 8 ; constituentType = 0 ; typeOfStatisticalProcessing = 1 ; - is_chemical = 1 ; } #Mean carbon dioxide net ecosystem exchange flux 'kg m**-2 s**-1' = { @@ -443,7 +433,6 @@ parameterNumber = 59 ; constituentType = 3 ; typeOfStatisticalProcessing = 0 ; - is_chemical = 1 ; } #Mean carbon dioxide gross primary production flux 'kg m**-2 s**-1' = { @@ -452,7 +441,6 @@ parameterNumber = 60 ; constituentType = 3 ; typeOfStatisticalProcessing = 0 ; - is_chemical = 1 ; } #Mean carbon dioxide ecosystem respiration flux 'kg m**-2 s**-1' = { @@ -461,7 +449,6 @@ parameterNumber = 61 ; constituentType = 3 ; typeOfStatisticalProcessing = 0 ; - is_chemical = 1 ; } #Time-mean logarithm of surface pressure 'Numeric' = { From 098592568fbe5fd98fa25eec1d78ef851d1bdd63 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Wed, 14 Aug 2024 10:44:05 +0000 Subject: [PATCH 20/27] ECC-1902: GRIB2: Parameter cleanup in preparation for the addition of statistically processed parameters --- definitions/grib1/localConcepts/ecmf/name.def | 80 --------- .../grib1/localConcepts/ecmf/paramId.def | 80 --------- .../grib1/localConcepts/ecmf/shortName.def | 80 --------- .../grib1/localConcepts/ecmf/units.def | 90 +--------- definitions/grib1/localConcepts/rjtd/name.def | 5 - .../grib1/localConcepts/rjtd/paramId.def | 5 - .../grib1/localConcepts/rjtd/shortName.def | 5 - .../grib1/localConcepts/rjtd/units.def | 5 - definitions/grib2/localConcepts/ecmf/name.def | 144 ---------------- .../grib2/localConcepts/ecmf/paramId.def | 144 ---------------- .../grib2/localConcepts/ecmf/shortName.def | 144 ---------------- .../grib2/localConcepts/ecmf/units.def | 154 +----------------- definitions/grib2/name.def | 42 ----- definitions/grib2/paramId.def | 42 ----- definitions/grib2/shortName.def | 42 ----- definitions/grib2/units.def | 42 ----- 16 files changed, 10 insertions(+), 1094 deletions(-) diff --git a/definitions/grib1/localConcepts/ecmf/name.def b/definitions/grib1/localConcepts/ecmf/name.def index 07bd12578..86e2052b0 100644 --- a/definitions/grib1/localConcepts/ecmf/name.def +++ b/definitions/grib1/localConcepts/ecmf/name.def @@ -2374,16 +2374,6 @@ table2Version = 200 ; indicatorOfParameter = 67 ; } -#Minimum stomatal resistance, low vegetation -'Minimum stomatal resistance, low vegetation' = { - table2Version = 200 ; - indicatorOfParameter = 68 ; - } -#Minimum stomatal resistance, high vegetation -'Minimum stomatal resistance, high vegetation' = { - table2Version = 200 ; - indicatorOfParameter = 69 ; - } #Biome cover, low vegetation 'Biome cover, low vegetation' = { table2Version = 200 ; @@ -10544,21 +10534,6 @@ table2Version = 235 ; indicatorOfParameter = 64 ; } -#Mean rain rate -'Mean rain rate' = { - table2Version = 235 ; - indicatorOfParameter = 65 ; - } -#Mean convective rain rate -'Mean convective rain rate' = { - table2Version = 235 ; - indicatorOfParameter = 66 ; - } -#Mean large-scale rain rate -'Mean large-scale rain rate' = { - table2Version = 235 ; - indicatorOfParameter = 67 ; - } #Mean surface downward short-wave radiation flux, clear sky 'Mean surface downward short-wave radiation flux, clear sky' = { table2Version = 235 ; @@ -10874,16 +10849,6 @@ table2Version = 129 ; indicatorOfParameter = 67 ; } -#Minimum stomatal resistance, low vegetation -'Minimum stomatal resistance, low vegetation' = { - table2Version = 129 ; - indicatorOfParameter = 68 ; - } -#Minimum stomatal resistance, high vegetation -'Minimum stomatal resistance, high vegetation' = { - table2Version = 129 ; - indicatorOfParameter = 69 ; - } #Biome cover, low vegetation 'Biome cover, low vegetation' = { table2Version = 129 ; @@ -13494,36 +13459,16 @@ table2Version = 160 ; indicatorOfParameter = 199 ; } -#Maximum temperature at 2 metres during averaging time -'Maximum temperature at 2 metres during averaging time' = { - table2Version = 160 ; - indicatorOfParameter = 201 ; - } -#Minimum temperature at 2 metres during averaging time -'Minimum temperature at 2 metres during averaging time' = { - table2Version = 160 ; - indicatorOfParameter = 202 ; - } #Runoff 'Runoff' = { table2Version = 160 ; indicatorOfParameter = 205 ; } -#Standard deviation of geopotential -'Standard deviation of geopotential' = { - table2Version = 160 ; - indicatorOfParameter = 206 ; - } #Covariance of temperature and geopotential 'Covariance of temperature and geopotential' = { table2Version = 160 ; indicatorOfParameter = 207 ; } -#Standard deviation of temperature -'Standard deviation of temperature' = { - table2Version = 160 ; - indicatorOfParameter = 208 ; - } #Covariance of specific humidity and geopotential 'Covariance of specific humidity and geopotential' = { table2Version = 160 ; @@ -13534,11 +13479,6 @@ table2Version = 160 ; indicatorOfParameter = 210 ; } -#Standard deviation of specific humidity -'Standard deviation of specific humidity' = { - table2Version = 160 ; - indicatorOfParameter = 211 ; - } #Covariance of U component and geopotential 'Covariance of U component and geopotential' = { table2Version = 160 ; @@ -13554,11 +13494,6 @@ table2Version = 160 ; indicatorOfParameter = 214 ; } -#Standard deviation of U velocity -'Standard deviation of U velocity' = { - table2Version = 160 ; - indicatorOfParameter = 215 ; - } #Covariance of V component and geopotential 'Covariance of V component and geopotential' = { table2Version = 160 ; @@ -13579,11 +13514,6 @@ table2Version = 160 ; indicatorOfParameter = 219 ; } -#Standard deviation of V component -'Standard deviation of V component' = { - table2Version = 160 ; - indicatorOfParameter = 220 ; - } #Covariance of W component and geopotential 'Covariance of W component and geopotential' = { table2Version = 160 ; @@ -13609,11 +13539,6 @@ table2Version = 160 ; indicatorOfParameter = 225 ; } -#Standard deviation of vertical velocity -'Standard deviation of vertical velocity' = { - table2Version = 160 ; - indicatorOfParameter = 226 ; - } #Instantaneous surface heat flux 'Instantaneous surface heat flux' = { table2Version = 160 ; @@ -16039,11 +15964,6 @@ table2Version = 201 ; indicatorOfParameter = 113 ; } -#deviation of pressure from reference value -'deviation of pressure from reference value' = { - table2Version = 201 ; - indicatorOfParameter = 139 ; - } #coefficient of horizontal diffusion 'coefficient of horizontal diffusion' = { table2Version = 201 ; diff --git a/definitions/grib1/localConcepts/ecmf/paramId.def b/definitions/grib1/localConcepts/ecmf/paramId.def index 3347f26b7..0067a92f6 100644 --- a/definitions/grib1/localConcepts/ecmf/paramId.def +++ b/definitions/grib1/localConcepts/ecmf/paramId.def @@ -2374,16 +2374,6 @@ table2Version = 200 ; indicatorOfParameter = 67 ; } -#Minimum stomatal resistance, low vegetation -'200068' = { - table2Version = 200 ; - indicatorOfParameter = 68 ; - } -#Minimum stomatal resistance, high vegetation -'200069' = { - table2Version = 200 ; - indicatorOfParameter = 69 ; - } #Biome cover, low vegetation '200070' = { table2Version = 200 ; @@ -10544,21 +10534,6 @@ table2Version = 235 ; indicatorOfParameter = 64 ; } -#Mean rain rate -'235065' = { - table2Version = 235 ; - indicatorOfParameter = 65 ; - } -#Mean convective rain rate -'235066' = { - table2Version = 235 ; - indicatorOfParameter = 66 ; - } -#Mean large-scale rain rate -'235067' = { - table2Version = 235 ; - indicatorOfParameter = 67 ; - } #Mean surface downward short-wave radiation flux, clear sky '235068' = { table2Version = 235 ; @@ -10874,16 +10849,6 @@ table2Version = 129 ; indicatorOfParameter = 67 ; } -#Minimum stomatal resistance, low vegetation -'129068' = { - table2Version = 129 ; - indicatorOfParameter = 68 ; - } -#Minimum stomatal resistance, high vegetation -'129069' = { - table2Version = 129 ; - indicatorOfParameter = 69 ; - } #Biome cover, low vegetation '129070' = { table2Version = 129 ; @@ -13494,36 +13459,16 @@ table2Version = 160 ; indicatorOfParameter = 199 ; } -#Maximum temperature at 2 metres during averaging time -'160201' = { - table2Version = 160 ; - indicatorOfParameter = 201 ; - } -#Minimum temperature at 2 metres during averaging time -'160202' = { - table2Version = 160 ; - indicatorOfParameter = 202 ; - } #Runoff '160205' = { table2Version = 160 ; indicatorOfParameter = 205 ; } -#Standard deviation of geopotential -'160206' = { - table2Version = 160 ; - indicatorOfParameter = 206 ; - } #Covariance of temperature and geopotential '160207' = { table2Version = 160 ; indicatorOfParameter = 207 ; } -#Standard deviation of temperature -'160208' = { - table2Version = 160 ; - indicatorOfParameter = 208 ; - } #Covariance of specific humidity and geopotential '160209' = { table2Version = 160 ; @@ -13534,11 +13479,6 @@ table2Version = 160 ; indicatorOfParameter = 210 ; } -#Standard deviation of specific humidity -'160211' = { - table2Version = 160 ; - indicatorOfParameter = 211 ; - } #Covariance of U component and geopotential '160212' = { table2Version = 160 ; @@ -13554,11 +13494,6 @@ table2Version = 160 ; indicatorOfParameter = 214 ; } -#Standard deviation of U velocity -'160215' = { - table2Version = 160 ; - indicatorOfParameter = 215 ; - } #Covariance of V component and geopotential '160216' = { table2Version = 160 ; @@ -13579,11 +13514,6 @@ table2Version = 160 ; indicatorOfParameter = 219 ; } -#Standard deviation of V component -'160220' = { - table2Version = 160 ; - indicatorOfParameter = 220 ; - } #Covariance of W component and geopotential '160221' = { table2Version = 160 ; @@ -13609,11 +13539,6 @@ table2Version = 160 ; indicatorOfParameter = 225 ; } -#Standard deviation of vertical velocity -'160226' = { - table2Version = 160 ; - indicatorOfParameter = 226 ; - } #Instantaneous surface heat flux '160231' = { table2Version = 160 ; @@ -16039,11 +15964,6 @@ table2Version = 201 ; indicatorOfParameter = 113 ; } -#deviation of pressure from reference value -'201139' = { - table2Version = 201 ; - indicatorOfParameter = 139 ; - } #coefficient of horizontal diffusion '201150' = { table2Version = 201 ; diff --git a/definitions/grib1/localConcepts/ecmf/shortName.def b/definitions/grib1/localConcepts/ecmf/shortName.def index fb32662bd..977615eff 100644 --- a/definitions/grib1/localConcepts/ecmf/shortName.def +++ b/definitions/grib1/localConcepts/ecmf/shortName.def @@ -2374,16 +2374,6 @@ table2Version = 200 ; indicatorOfParameter = 67 ; } -#Minimum stomatal resistance, low vegetation -'~' = { - table2Version = 200 ; - indicatorOfParameter = 68 ; - } -#Minimum stomatal resistance, high vegetation -'~' = { - table2Version = 200 ; - indicatorOfParameter = 69 ; - } #Biome cover, low vegetation '~' = { table2Version = 200 ; @@ -10544,21 +10534,6 @@ table2Version = 235 ; indicatorOfParameter = 64 ; } -#Mean rain rate -'mrr' = { - table2Version = 235 ; - indicatorOfParameter = 65 ; - } -#Mean convective rain rate -'mcrr' = { - table2Version = 235 ; - indicatorOfParameter = 66 ; - } -#Mean large-scale rain rate -'mlsrr' = { - table2Version = 235 ; - indicatorOfParameter = 67 ; - } #Mean surface downward short-wave radiation flux, clear sky 'msdwswrfcs' = { table2Version = 235 ; @@ -10874,16 +10849,6 @@ table2Version = 129 ; indicatorOfParameter = 67 ; } -#Minimum stomatal resistance, low vegetation -'~' = { - table2Version = 129 ; - indicatorOfParameter = 68 ; - } -#Minimum stomatal resistance, high vegetation -'~' = { - table2Version = 129 ; - indicatorOfParameter = 69 ; - } #Biome cover, low vegetation '~' = { table2Version = 129 ; @@ -13494,36 +13459,16 @@ table2Version = 160 ; indicatorOfParameter = 199 ; } -#Maximum temperature at 2 metres during averaging time -'mx2trea' = { - table2Version = 160 ; - indicatorOfParameter = 201 ; - } -#Minimum temperature at 2 metres during averaging time -'mn2trea' = { - table2Version = 160 ; - indicatorOfParameter = 202 ; - } #Runoff 'rorea' = { table2Version = 160 ; indicatorOfParameter = 205 ; } -#Standard deviation of geopotential -'zzrea' = { - table2Version = 160 ; - indicatorOfParameter = 206 ; - } #Covariance of temperature and geopotential 'tzrea' = { table2Version = 160 ; indicatorOfParameter = 207 ; } -#Standard deviation of temperature -'ttrea' = { - table2Version = 160 ; - indicatorOfParameter = 208 ; - } #Covariance of specific humidity and geopotential 'qzrea' = { table2Version = 160 ; @@ -13534,11 +13479,6 @@ table2Version = 160 ; indicatorOfParameter = 210 ; } -#Standard deviation of specific humidity -'qqrea' = { - table2Version = 160 ; - indicatorOfParameter = 211 ; - } #Covariance of U component and geopotential 'uzrea' = { table2Version = 160 ; @@ -13554,11 +13494,6 @@ table2Version = 160 ; indicatorOfParameter = 214 ; } -#Standard deviation of U velocity -'uurea' = { - table2Version = 160 ; - indicatorOfParameter = 215 ; - } #Covariance of V component and geopotential 'vzrea' = { table2Version = 160 ; @@ -13579,11 +13514,6 @@ table2Version = 160 ; indicatorOfParameter = 219 ; } -#Standard deviation of V component -'vvrea' = { - table2Version = 160 ; - indicatorOfParameter = 220 ; - } #Covariance of W component and geopotential 'wzrea' = { table2Version = 160 ; @@ -13609,11 +13539,6 @@ table2Version = 160 ; indicatorOfParameter = 225 ; } -#Standard deviation of vertical velocity -'wwrea' = { - table2Version = 160 ; - indicatorOfParameter = 226 ; - } #Instantaneous surface heat flux 'ishfrea' = { table2Version = 160 ; @@ -16039,11 +15964,6 @@ table2Version = 201 ; indicatorOfParameter = 113 ; } -#deviation of pressure from reference value -'pp' = { - table2Version = 201 ; - indicatorOfParameter = 139 ; - } #coefficient of horizontal diffusion '~' = { table2Version = 201 ; diff --git a/definitions/grib1/localConcepts/ecmf/units.def b/definitions/grib1/localConcepts/ecmf/units.def index 6ec4e8064..6aa3f3cea 100644 --- a/definitions/grib1/localConcepts/ecmf/units.def +++ b/definitions/grib1/localConcepts/ecmf/units.def @@ -2374,16 +2374,6 @@ table2Version = 200 ; indicatorOfParameter = 67 ; } -#Minimum stomatal resistance, low vegetation -'s m**-1' = { - table2Version = 200 ; - indicatorOfParameter = 68 ; - } -#Minimum stomatal resistance, high vegetation -'s m**-1' = { - table2Version = 200 ; - indicatorOfParameter = 69 ; - } #Biome cover, low vegetation '(0 - 1)' = { table2Version = 200 ; @@ -10544,21 +10534,6 @@ table2Version = 235 ; indicatorOfParameter = 64 ; } -#Mean rain rate -'kg m**-2 s**-1' = { - table2Version = 235 ; - indicatorOfParameter = 65 ; - } -#Mean convective rain rate -'kg m**-2 s**-1' = { - table2Version = 235 ; - indicatorOfParameter = 66 ; - } -#Mean large-scale rain rate -'kg m**-2 s**-1' = { - table2Version = 235 ; - indicatorOfParameter = 67 ; - } #Mean surface downward short-wave radiation flux, clear sky 'W m**-2' = { table2Version = 235 ; @@ -10874,16 +10849,6 @@ table2Version = 129 ; indicatorOfParameter = 67 ; } -#Minimum stomatal resistance, low vegetation -'s m**-1' = { - table2Version = 129 ; - indicatorOfParameter = 68 ; - } -#Minimum stomatal resistance, high vegetation -'s m**-1' = { - table2Version = 129 ; - indicatorOfParameter = 69 ; - } #Biome cover, low vegetation '(0 - 1)' = { table2Version = 129 ; @@ -13494,36 +13459,16 @@ table2Version = 160 ; indicatorOfParameter = 199 ; } -#Maximum temperature at 2 metres during averaging time -'K' = { - table2Version = 160 ; - indicatorOfParameter = 201 ; - } -#Minimum temperature at 2 metres during averaging time -'K' = { - table2Version = 160 ; - indicatorOfParameter = 202 ; - } #Runoff 'kg m**-2 s**-1' = { table2Version = 160 ; indicatorOfParameter = 205 ; } -#Standard deviation of geopotential -'m**2 s**-2' = { - table2Version = 160 ; - indicatorOfParameter = 206 ; - } #Covariance of temperature and geopotential 'K m**2 s**-2' = { table2Version = 160 ; indicatorOfParameter = 207 ; } -#Standard deviation of temperature -'K' = { - table2Version = 160 ; - indicatorOfParameter = 208 ; - } #Covariance of specific humidity and geopotential 'm**2 s**-2' = { table2Version = 160 ; @@ -13534,11 +13479,6 @@ table2Version = 160 ; indicatorOfParameter = 210 ; } -#Standard deviation of specific humidity -'(0 - 1)' = { - table2Version = 160 ; - indicatorOfParameter = 211 ; - } #Covariance of U component and geopotential 'm**3 s**-3' = { table2Version = 160 ; @@ -13554,11 +13494,6 @@ table2Version = 160 ; indicatorOfParameter = 214 ; } -#Standard deviation of U velocity -'m s**-1' = { - table2Version = 160 ; - indicatorOfParameter = 215 ; - } #Covariance of V component and geopotential 'm**3 s**-3' = { table2Version = 160 ; @@ -13579,11 +13514,6 @@ table2Version = 160 ; indicatorOfParameter = 219 ; } -#Standard deviation of V component -'m s**-1' = { - table2Version = 160 ; - indicatorOfParameter = 220 ; - } #Covariance of W component and geopotential 'Pa m**2 s**-3' = { table2Version = 160 ; @@ -13609,11 +13539,6 @@ table2Version = 160 ; indicatorOfParameter = 225 ; } -#Standard deviation of vertical velocity -'Pa s**-1' = { - table2Version = 160 ; - indicatorOfParameter = 226 ; - } #Instantaneous surface heat flux 'J m**-2' = { table2Version = 160 ; @@ -14975,12 +14900,12 @@ indicatorOfParameter = 255 ; } #Snow evaporation -'m of water s**-1' = { +'m of water equivalent s**-1' = { table2Version = 172 ; indicatorOfParameter = 44 ; } #Snowmelt -'m of water s**-1' = { +'m of water equivalent s**-1' = { table2Version = 172 ; indicatorOfParameter = 45 ; } @@ -15145,12 +15070,12 @@ indicatorOfParameter = 255 ; } #Snow evaporation anomaly -'m of water s**-1' = { +'m of water equivalent s**-1' = { table2Version = 173 ; indicatorOfParameter = 44 ; } #Snowmelt anomaly -'m of water s**-1' = { +'m of water equivalent s**-1' = { table2Version = 173 ; indicatorOfParameter = 45 ; } @@ -15250,7 +15175,7 @@ indicatorOfParameter = 181 ; } #Evaporation anomalous rate of accumulation -'m of water s**-1' = { +'m of water equivalent s**-1' = { table2Version = 173 ; indicatorOfParameter = 182 ; } @@ -16039,11 +15964,6 @@ table2Version = 201 ; indicatorOfParameter = 113 ; } -#deviation of pressure from reference value -'Pa' = { - table2Version = 201 ; - indicatorOfParameter = 139 ; - } #coefficient of horizontal diffusion 'm**2 s**-1' = { table2Version = 201 ; diff --git a/definitions/grib1/localConcepts/rjtd/name.def b/definitions/grib1/localConcepts/rjtd/name.def index 3b4fa8db8..273bcfc53 100644 --- a/definitions/grib1/localConcepts/rjtd/name.def +++ b/definitions/grib1/localConcepts/rjtd/name.def @@ -213,11 +213,6 @@ table2Version = 200 ; indicatorOfParameter = 78 ; } -#Maximum wind speed -'Maximum wind speed' = { - table2Version = 200 ; - indicatorOfParameter = 219 ; - } #Surface downward short-wave radiation flux 'Surface downward short-wave radiation flux' = { table2Version = 200 ; diff --git a/definitions/grib1/localConcepts/rjtd/paramId.def b/definitions/grib1/localConcepts/rjtd/paramId.def index 392359de9..989e5d15a 100644 --- a/definitions/grib1/localConcepts/rjtd/paramId.def +++ b/definitions/grib1/localConcepts/rjtd/paramId.def @@ -213,11 +213,6 @@ table2Version = 200 ; indicatorOfParameter = 78 ; } -#Maximum wind speed -'260064' = { - table2Version = 200 ; - indicatorOfParameter = 219 ; - } #Surface downward short-wave radiation flux '260087' = { table2Version = 200 ; diff --git a/definitions/grib1/localConcepts/rjtd/shortName.def b/definitions/grib1/localConcepts/rjtd/shortName.def index 766592e9b..6bb3018f9 100644 --- a/definitions/grib1/localConcepts/rjtd/shortName.def +++ b/definitions/grib1/localConcepts/rjtd/shortName.def @@ -213,11 +213,6 @@ table2Version = 200 ; indicatorOfParameter = 78 ; } -#Maximum wind speed -'maxgust' = { - table2Version = 200 ; - indicatorOfParameter = 219 ; - } #Surface downward short-wave radiation flux 'sdswrf' = { table2Version = 200 ; diff --git a/definitions/grib1/localConcepts/rjtd/units.def b/definitions/grib1/localConcepts/rjtd/units.def index 81ef6cf02..b33c58ee8 100644 --- a/definitions/grib1/localConcepts/rjtd/units.def +++ b/definitions/grib1/localConcepts/rjtd/units.def @@ -213,11 +213,6 @@ table2Version = 200 ; indicatorOfParameter = 78 ; } -#Maximum wind speed -'m s**-1' = { - table2Version = 200 ; - indicatorOfParameter = 219 ; - } #Surface downward short-wave radiation flux 'W m**-2' = { table2Version = 200 ; diff --git a/definitions/grib2/localConcepts/ecmf/name.def b/definitions/grib2/localConcepts/ecmf/name.def index 8d00d429a..d3796d9dc 100644 --- a/definitions/grib2/localConcepts/ecmf/name.def +++ b/definitions/grib2/localConcepts/ecmf/name.def @@ -242,18 +242,6 @@ parameterCategory = 128 ; parameterNumber = 65 ; } -#Minimum stomatal resistance, low vegetation -'Minimum stomatal resistance, low vegetation' = { - discipline = 192 ; - parameterCategory = 128 ; - parameterNumber = 68 ; - } -#Minimum stomatal resistance, high vegetation -'Minimum stomatal resistance, high vegetation' = { - discipline = 192 ; - parameterCategory = 128 ; - parameterNumber = 69 ; - } #Biome cover, low vegetation 'Biome cover, low vegetation' = { discipline = 192 ; @@ -1277,18 +1265,6 @@ parameterCategory = 200 ; parameterNumber = 67 ; } -#Minimum stomatal resistance, low vegetation -'Minimum stomatal resistance, low vegetation' = { - discipline = 192 ; - parameterCategory = 200 ; - parameterNumber = 68 ; - } -#Minimum stomatal resistance, high vegetation -'Minimum stomatal resistance, high vegetation' = { - discipline = 192 ; - parameterCategory = 200 ; - parameterNumber = 69 ; - } #Biome cover, low vegetation 'Biome cover, low vegetation' = { discipline = 192 ; @@ -14524,18 +14500,6 @@ parameterCategory = 129 ; parameterNumber = 67 ; } -#Minimum stomatal resistance, low vegetation -'Minimum stomatal resistance, low vegetation' = { - discipline = 192 ; - parameterCategory = 129 ; - parameterNumber = 68 ; - } -#Minimum stomatal resistance, high vegetation -'Minimum stomatal resistance, high vegetation' = { - discipline = 192 ; - parameterCategory = 129 ; - parameterNumber = 69 ; - } #Biome cover, low vegetation 'Biome cover, low vegetation' = { discipline = 192 ; @@ -17024,30 +16988,6 @@ parameterCategory = 151 ; parameterNumber = 170 ; } -#U velocity maximum -'U velocity maximum' = { - discipline = 192 ; - parameterCategory = 151 ; - parameterNumber = 171 ; - } -#Depth of the velocity maximum -'Depth of the velocity maximum' = { - discipline = 192 ; - parameterCategory = 151 ; - parameterNumber = 172 ; - } -#Salinity maximum -'Salinity maximum' = { - discipline = 192 ; - parameterCategory = 151 ; - parameterNumber = 173 ; - } -#Depth of salinity maximum -'Depth of salinity maximum' = { - discipline = 192 ; - parameterCategory = 151 ; - parameterNumber = 174 ; - } #Layer Thickness at scalar points 'Layer Thickness at scalar points' = { discipline = 192 ; @@ -17330,42 +17270,18 @@ parameterCategory = 160 ; parameterNumber = 199 ; } -#Maximum temperature at 2 metres during averaging time -'Maximum temperature at 2 metres during averaging time' = { - discipline = 192 ; - parameterCategory = 160 ; - parameterNumber = 201 ; - } -#Minimum temperature at 2 metres during averaging time -'Minimum temperature at 2 metres during averaging time' = { - discipline = 192 ; - parameterCategory = 160 ; - parameterNumber = 202 ; - } #Runoff 'Runoff' = { discipline = 192 ; parameterCategory = 160 ; parameterNumber = 205 ; } -#Standard deviation of geopotential -'Standard deviation of geopotential' = { - discipline = 192 ; - parameterCategory = 160 ; - parameterNumber = 206 ; - } #Covariance of temperature and geopotential 'Covariance of temperature and geopotential' = { discipline = 192 ; parameterCategory = 160 ; parameterNumber = 207 ; } -#Standard deviation of temperature -'Standard deviation of temperature' = { - discipline = 192 ; - parameterCategory = 160 ; - parameterNumber = 208 ; - } #Covariance of specific humidity and geopotential 'Covariance of specific humidity and geopotential' = { discipline = 192 ; @@ -17378,12 +17294,6 @@ parameterCategory = 160 ; parameterNumber = 210 ; } -#Standard deviation of specific humidity -'Standard deviation of specific humidity' = { - discipline = 192 ; - parameterCategory = 160 ; - parameterNumber = 211 ; - } #Covariance of U component and geopotential 'Covariance of U component and geopotential' = { discipline = 192 ; @@ -17402,12 +17312,6 @@ parameterCategory = 160 ; parameterNumber = 214 ; } -#Standard deviation of U velocity -'Standard deviation of U velocity' = { - discipline = 192 ; - parameterCategory = 160 ; - parameterNumber = 215 ; - } #Covariance of V component and geopotential 'Covariance of V component and geopotential' = { discipline = 192 ; @@ -17432,12 +17336,6 @@ parameterCategory = 160 ; parameterNumber = 219 ; } -#Standard deviation of V component -'Standard deviation of V component' = { - discipline = 192 ; - parameterCategory = 160 ; - parameterNumber = 220 ; - } #Covariance of W component and geopotential 'Covariance of W component and geopotential' = { discipline = 192 ; @@ -17468,12 +17366,6 @@ parameterCategory = 160 ; parameterNumber = 225 ; } -#Standard deviation of vertical velocity -'Standard deviation of vertical velocity' = { - discipline = 192 ; - parameterCategory = 160 ; - parameterNumber = 226 ; - } #Instantaneous surface heat flux 'Instantaneous surface heat flux' = { discipline = 192 ; @@ -19238,18 +19130,6 @@ parameterCategory = 174 ; parameterNumber = 183 ; } -#1.5m temperature - maximum in the last 24 hours -'1.5m temperature - maximum in the last 24 hours' = { - discipline = 192 ; - parameterCategory = 174 ; - parameterNumber = 201 ; - } -#1.5m temperature - minimum in the last 24 hours -'1.5m temperature - minimum in the last 24 hours' = { - discipline = 192 ; - parameterCategory = 174 ; - parameterNumber = 202 ; - } #Soil temperature layer 4 'Soil temperature layer 4' = { discipline = 192 ; @@ -19412,18 +19292,6 @@ parameterCategory = 175 ; parameterNumber = 183 ; } -#1.5m temperature - maximum in the last 24 hours -'1.5m temperature - maximum in the last 24 hours' = { - discipline = 192 ; - parameterCategory = 175 ; - parameterNumber = 201 ; - } -#1.5m temperature - minimum in the last 24 hours -'1.5m temperature - minimum in the last 24 hours' = { - discipline = 192 ; - parameterCategory = 175 ; - parameterNumber = 202 ; - } #Soil temperature layer 4 'Soil temperature layer 4' = { discipline = 192 ; @@ -19910,24 +19778,12 @@ parameterCategory = 201 ; parameterNumber = 113 ; } -#deviation of pressure from reference value -'deviation of pressure from reference value' = { - discipline = 192 ; - parameterCategory = 201 ; - parameterNumber = 139 ; - } #coefficient of horizontal diffusion 'coefficient of horizontal diffusion' = { discipline = 192 ; parameterCategory = 201 ; parameterNumber = 150 ; } -#Maximum wind velocity -'Maximum wind velocity' = { - discipline = 192 ; - parameterCategory = 201 ; - parameterNumber = 187 ; - } #water content of interception store 'water content of interception store' = { discipline = 192 ; diff --git a/definitions/grib2/localConcepts/ecmf/paramId.def b/definitions/grib2/localConcepts/ecmf/paramId.def index b4e5a0c5f..8bb06bf69 100644 --- a/definitions/grib2/localConcepts/ecmf/paramId.def +++ b/definitions/grib2/localConcepts/ecmf/paramId.def @@ -242,18 +242,6 @@ parameterCategory = 128 ; parameterNumber = 65 ; } -#Minimum stomatal resistance, low vegetation -'68' = { - discipline = 192 ; - parameterCategory = 128 ; - parameterNumber = 68 ; - } -#Minimum stomatal resistance, high vegetation -'69' = { - discipline = 192 ; - parameterCategory = 128 ; - parameterNumber = 69 ; - } #Biome cover, low vegetation '70' = { discipline = 192 ; @@ -1277,18 +1265,6 @@ parameterCategory = 200 ; parameterNumber = 67 ; } -#Minimum stomatal resistance, low vegetation -'200068' = { - discipline = 192 ; - parameterCategory = 200 ; - parameterNumber = 68 ; - } -#Minimum stomatal resistance, high vegetation -'200069' = { - discipline = 192 ; - parameterCategory = 200 ; - parameterNumber = 69 ; - } #Biome cover, low vegetation '200070' = { discipline = 192 ; @@ -14524,18 +14500,6 @@ parameterCategory = 129 ; parameterNumber = 67 ; } -#Minimum stomatal resistance, low vegetation -'129068' = { - discipline = 192 ; - parameterCategory = 129 ; - parameterNumber = 68 ; - } -#Minimum stomatal resistance, high vegetation -'129069' = { - discipline = 192 ; - parameterCategory = 129 ; - parameterNumber = 69 ; - } #Biome cover, low vegetation '129070' = { discipline = 192 ; @@ -17024,30 +16988,6 @@ parameterCategory = 151 ; parameterNumber = 170 ; } -#U velocity maximum -'151171' = { - discipline = 192 ; - parameterCategory = 151 ; - parameterNumber = 171 ; - } -#Depth of the velocity maximum -'151172' = { - discipline = 192 ; - parameterCategory = 151 ; - parameterNumber = 172 ; - } -#Salinity maximum -'151173' = { - discipline = 192 ; - parameterCategory = 151 ; - parameterNumber = 173 ; - } -#Depth of salinity maximum -'151174' = { - discipline = 192 ; - parameterCategory = 151 ; - parameterNumber = 174 ; - } #Layer Thickness at scalar points '151176' = { discipline = 192 ; @@ -17330,42 +17270,18 @@ parameterCategory = 160 ; parameterNumber = 199 ; } -#Maximum temperature at 2 metres during averaging time -'160201' = { - discipline = 192 ; - parameterCategory = 160 ; - parameterNumber = 201 ; - } -#Minimum temperature at 2 metres during averaging time -'160202' = { - discipline = 192 ; - parameterCategory = 160 ; - parameterNumber = 202 ; - } #Runoff '160205' = { discipline = 192 ; parameterCategory = 160 ; parameterNumber = 205 ; } -#Standard deviation of geopotential -'160206' = { - discipline = 192 ; - parameterCategory = 160 ; - parameterNumber = 206 ; - } #Covariance of temperature and geopotential '160207' = { discipline = 192 ; parameterCategory = 160 ; parameterNumber = 207 ; } -#Standard deviation of temperature -'160208' = { - discipline = 192 ; - parameterCategory = 160 ; - parameterNumber = 208 ; - } #Covariance of specific humidity and geopotential '160209' = { discipline = 192 ; @@ -17378,12 +17294,6 @@ parameterCategory = 160 ; parameterNumber = 210 ; } -#Standard deviation of specific humidity -'160211' = { - discipline = 192 ; - parameterCategory = 160 ; - parameterNumber = 211 ; - } #Covariance of U component and geopotential '160212' = { discipline = 192 ; @@ -17402,12 +17312,6 @@ parameterCategory = 160 ; parameterNumber = 214 ; } -#Standard deviation of U velocity -'160215' = { - discipline = 192 ; - parameterCategory = 160 ; - parameterNumber = 215 ; - } #Covariance of V component and geopotential '160216' = { discipline = 192 ; @@ -17432,12 +17336,6 @@ parameterCategory = 160 ; parameterNumber = 219 ; } -#Standard deviation of V component -'160220' = { - discipline = 192 ; - parameterCategory = 160 ; - parameterNumber = 220 ; - } #Covariance of W component and geopotential '160221' = { discipline = 192 ; @@ -17468,12 +17366,6 @@ parameterCategory = 160 ; parameterNumber = 225 ; } -#Standard deviation of vertical velocity -'160226' = { - discipline = 192 ; - parameterCategory = 160 ; - parameterNumber = 226 ; - } #Instantaneous surface heat flux '160231' = { discipline = 192 ; @@ -19238,18 +19130,6 @@ parameterCategory = 174 ; parameterNumber = 183 ; } -#1.5m temperature - maximum in the last 24 hours -'174201' = { - discipline = 192 ; - parameterCategory = 174 ; - parameterNumber = 201 ; - } -#1.5m temperature - minimum in the last 24 hours -'174202' = { - discipline = 192 ; - parameterCategory = 174 ; - parameterNumber = 202 ; - } #Soil temperature layer 4 '174236' = { discipline = 192 ; @@ -19412,18 +19292,6 @@ parameterCategory = 175 ; parameterNumber = 183 ; } -#1.5m temperature - maximum in the last 24 hours -'175201' = { - discipline = 192 ; - parameterCategory = 175 ; - parameterNumber = 201 ; - } -#1.5m temperature - minimum in the last 24 hours -'175202' = { - discipline = 192 ; - parameterCategory = 175 ; - parameterNumber = 202 ; - } #Soil temperature layer 4 '175236' = { discipline = 192 ; @@ -19910,24 +19778,12 @@ parameterCategory = 201 ; parameterNumber = 113 ; } -#deviation of pressure from reference value -'201139' = { - discipline = 192 ; - parameterCategory = 201 ; - parameterNumber = 139 ; - } #coefficient of horizontal diffusion '201150' = { discipline = 192 ; parameterCategory = 201 ; parameterNumber = 150 ; } -#Maximum wind velocity -'201187' = { - discipline = 192 ; - parameterCategory = 201 ; - parameterNumber = 187 ; - } #water content of interception store '201200' = { discipline = 192 ; diff --git a/definitions/grib2/localConcepts/ecmf/shortName.def b/definitions/grib2/localConcepts/ecmf/shortName.def index 2f124dd73..2f4055501 100644 --- a/definitions/grib2/localConcepts/ecmf/shortName.def +++ b/definitions/grib2/localConcepts/ecmf/shortName.def @@ -242,18 +242,6 @@ parameterCategory = 128 ; parameterNumber = 65 ; } -#Minimum stomatal resistance, low vegetation -'msr_lv' = { - discipline = 192 ; - parameterCategory = 128 ; - parameterNumber = 68 ; - } -#Minimum stomatal resistance, high vegetation -'msr_hv' = { - discipline = 192 ; - parameterCategory = 128 ; - parameterNumber = 69 ; - } #Biome cover, low vegetation 'bc_lv' = { discipline = 192 ; @@ -1277,18 +1265,6 @@ parameterCategory = 200 ; parameterNumber = 67 ; } -#Minimum stomatal resistance, low vegetation -'~' = { - discipline = 192 ; - parameterCategory = 200 ; - parameterNumber = 68 ; - } -#Minimum stomatal resistance, high vegetation -'~' = { - discipline = 192 ; - parameterCategory = 200 ; - parameterNumber = 69 ; - } #Biome cover, low vegetation '~' = { discipline = 192 ; @@ -14524,18 +14500,6 @@ parameterCategory = 129 ; parameterNumber = 67 ; } -#Minimum stomatal resistance, low vegetation -'~' = { - discipline = 192 ; - parameterCategory = 129 ; - parameterNumber = 68 ; - } -#Minimum stomatal resistance, high vegetation -'~' = { - discipline = 192 ; - parameterCategory = 129 ; - parameterNumber = 69 ; - } #Biome cover, low vegetation '~' = { discipline = 192 ; @@ -17024,30 +16988,6 @@ parameterCategory = 151 ; parameterNumber = 170 ; } -#U velocity maximum -'umax' = { - discipline = 192 ; - parameterCategory = 151 ; - parameterNumber = 171 ; - } -#Depth of the velocity maximum -'dumax' = { - discipline = 192 ; - parameterCategory = 151 ; - parameterNumber = 172 ; - } -#Salinity maximum -'smax' = { - discipline = 192 ; - parameterCategory = 151 ; - parameterNumber = 173 ; - } -#Depth of salinity maximum -'dsmax' = { - discipline = 192 ; - parameterCategory = 151 ; - parameterNumber = 174 ; - } #Layer Thickness at scalar points 'ldp' = { discipline = 192 ; @@ -17330,42 +17270,18 @@ parameterCategory = 160 ; parameterNumber = 199 ; } -#Maximum temperature at 2 metres during averaging time -'mx2trea' = { - discipline = 192 ; - parameterCategory = 160 ; - parameterNumber = 201 ; - } -#Minimum temperature at 2 metres during averaging time -'mn2trea' = { - discipline = 192 ; - parameterCategory = 160 ; - parameterNumber = 202 ; - } #Runoff 'rorea' = { discipline = 192 ; parameterCategory = 160 ; parameterNumber = 205 ; } -#Standard deviation of geopotential -'zzrea' = { - discipline = 192 ; - parameterCategory = 160 ; - parameterNumber = 206 ; - } #Covariance of temperature and geopotential 'tzrea' = { discipline = 192 ; parameterCategory = 160 ; parameterNumber = 207 ; } -#Standard deviation of temperature -'ttrea' = { - discipline = 192 ; - parameterCategory = 160 ; - parameterNumber = 208 ; - } #Covariance of specific humidity and geopotential 'qzrea' = { discipline = 192 ; @@ -17378,12 +17294,6 @@ parameterCategory = 160 ; parameterNumber = 210 ; } -#Standard deviation of specific humidity -'qqrea' = { - discipline = 192 ; - parameterCategory = 160 ; - parameterNumber = 211 ; - } #Covariance of U component and geopotential 'uzrea' = { discipline = 192 ; @@ -17402,12 +17312,6 @@ parameterCategory = 160 ; parameterNumber = 214 ; } -#Standard deviation of U velocity -'uurea' = { - discipline = 192 ; - parameterCategory = 160 ; - parameterNumber = 215 ; - } #Covariance of V component and geopotential 'vzrea' = { discipline = 192 ; @@ -17432,12 +17336,6 @@ parameterCategory = 160 ; parameterNumber = 219 ; } -#Standard deviation of V component -'vvrea' = { - discipline = 192 ; - parameterCategory = 160 ; - parameterNumber = 220 ; - } #Covariance of W component and geopotential 'wzrea' = { discipline = 192 ; @@ -17468,12 +17366,6 @@ parameterCategory = 160 ; parameterNumber = 225 ; } -#Standard deviation of vertical velocity -'wwrea' = { - discipline = 192 ; - parameterCategory = 160 ; - parameterNumber = 226 ; - } #Instantaneous surface heat flux 'ishfrea' = { discipline = 192 ; @@ -19238,18 +19130,6 @@ parameterCategory = 174 ; parameterNumber = 183 ; } -#1.5m temperature - maximum in the last 24 hours -'~' = { - discipline = 192 ; - parameterCategory = 174 ; - parameterNumber = 201 ; - } -#1.5m temperature - minimum in the last 24 hours -'~' = { - discipline = 192 ; - parameterCategory = 174 ; - parameterNumber = 202 ; - } #Soil temperature layer 4 '~' = { discipline = 192 ; @@ -19412,18 +19292,6 @@ parameterCategory = 175 ; parameterNumber = 183 ; } -#1.5m temperature - maximum in the last 24 hours -'~' = { - discipline = 192 ; - parameterCategory = 175 ; - parameterNumber = 201 ; - } -#1.5m temperature - minimum in the last 24 hours -'~' = { - discipline = 192 ; - parameterCategory = 175 ; - parameterNumber = 202 ; - } #Soil temperature layer 4 '~' = { discipline = 192 ; @@ -19910,24 +19778,12 @@ parameterCategory = 201 ; parameterNumber = 113 ; } -#deviation of pressure from reference value -'pp' = { - discipline = 192 ; - parameterCategory = 201 ; - parameterNumber = 139 ; - } #coefficient of horizontal diffusion '~' = { discipline = 192 ; parameterCategory = 201 ; parameterNumber = 150 ; } -#Maximum wind velocity -'vmax_10m' = { - discipline = 192 ; - parameterCategory = 201 ; - parameterNumber = 187 ; - } #water content of interception store 'w_i' = { discipline = 192 ; diff --git a/definitions/grib2/localConcepts/ecmf/units.def b/definitions/grib2/localConcepts/ecmf/units.def index c8c65ba8a..642222341 100644 --- a/definitions/grib2/localConcepts/ecmf/units.def +++ b/definitions/grib2/localConcepts/ecmf/units.def @@ -242,18 +242,6 @@ parameterCategory = 128 ; parameterNumber = 65 ; } -#Minimum stomatal resistance, low vegetation -'s m**-1' = { - discipline = 192 ; - parameterCategory = 128 ; - parameterNumber = 68 ; - } -#Minimum stomatal resistance, high vegetation -'s m**-1' = { - discipline = 192 ; - parameterCategory = 128 ; - parameterNumber = 69 ; - } #Biome cover, low vegetation '(0 - 1)' = { discipline = 192 ; @@ -1277,18 +1265,6 @@ parameterCategory = 200 ; parameterNumber = 67 ; } -#Minimum stomatal resistance, low vegetation -'s m**-1' = { - discipline = 192 ; - parameterCategory = 200 ; - parameterNumber = 68 ; - } -#Minimum stomatal resistance, high vegetation -'s m**-1' = { - discipline = 192 ; - parameterCategory = 200 ; - parameterNumber = 69 ; - } #Biome cover, low vegetation '(0 - 1)' = { discipline = 192 ; @@ -14524,18 +14500,6 @@ parameterCategory = 129 ; parameterNumber = 67 ; } -#Minimum stomatal resistance, low vegetation -'s m**-1' = { - discipline = 192 ; - parameterCategory = 129 ; - parameterNumber = 68 ; - } -#Minimum stomatal resistance, high vegetation -'s m**-1' = { - discipline = 192 ; - parameterCategory = 129 ; - parameterNumber = 69 ; - } #Biome cover, low vegetation '(0 - 1)' = { discipline = 192 ; @@ -17024,30 +16988,6 @@ parameterCategory = 151 ; parameterNumber = 170 ; } -#U velocity maximum -'m s**-1' = { - discipline = 192 ; - parameterCategory = 151 ; - parameterNumber = 171 ; - } -#Depth of the velocity maximum -'m' = { - discipline = 192 ; - parameterCategory = 151 ; - parameterNumber = 172 ; - } -#Salinity maximum -'psu' = { - discipline = 192 ; - parameterCategory = 151 ; - parameterNumber = 173 ; - } -#Depth of salinity maximum -'m' = { - discipline = 192 ; - parameterCategory = 151 ; - parameterNumber = 174 ; - } #Layer Thickness at scalar points 'm' = { discipline = 192 ; @@ -17330,42 +17270,18 @@ parameterCategory = 160 ; parameterNumber = 199 ; } -#Maximum temperature at 2 metres during averaging time -'K' = { - discipline = 192 ; - parameterCategory = 160 ; - parameterNumber = 201 ; - } -#Minimum temperature at 2 metres during averaging time -'K' = { - discipline = 192 ; - parameterCategory = 160 ; - parameterNumber = 202 ; - } #Runoff 'kg m**-2 s**-1' = { discipline = 192 ; parameterCategory = 160 ; parameterNumber = 205 ; } -#Standard deviation of geopotential -'m**2 s**-2' = { - discipline = 192 ; - parameterCategory = 160 ; - parameterNumber = 206 ; - } #Covariance of temperature and geopotential 'K m**2 s**-2' = { discipline = 192 ; parameterCategory = 160 ; parameterNumber = 207 ; } -#Standard deviation of temperature -'K' = { - discipline = 192 ; - parameterCategory = 160 ; - parameterNumber = 208 ; - } #Covariance of specific humidity and geopotential 'm**2 s**-2' = { discipline = 192 ; @@ -17378,12 +17294,6 @@ parameterCategory = 160 ; parameterNumber = 210 ; } -#Standard deviation of specific humidity -'(0 - 1)' = { - discipline = 192 ; - parameterCategory = 160 ; - parameterNumber = 211 ; - } #Covariance of U component and geopotential 'm**3 s**-3' = { discipline = 192 ; @@ -17402,12 +17312,6 @@ parameterCategory = 160 ; parameterNumber = 214 ; } -#Standard deviation of U velocity -'m s**-1' = { - discipline = 192 ; - parameterCategory = 160 ; - parameterNumber = 215 ; - } #Covariance of V component and geopotential 'm**3 s**-3' = { discipline = 192 ; @@ -17432,12 +17336,6 @@ parameterCategory = 160 ; parameterNumber = 219 ; } -#Standard deviation of V component -'m s**-1' = { - discipline = 192 ; - parameterCategory = 160 ; - parameterNumber = 220 ; - } #Covariance of W component and geopotential 'Pa m**2 s**-3' = { discipline = 192 ; @@ -17468,12 +17366,6 @@ parameterCategory = 160 ; parameterNumber = 225 ; } -#Standard deviation of vertical velocity -'Pa s**-1' = { - discipline = 192 ; - parameterCategory = 160 ; - parameterNumber = 226 ; - } #Instantaneous surface heat flux 'J m**-2' = { discipline = 192 ; @@ -18759,13 +18651,13 @@ parameterNumber = 255 ; } #Snow evaporation -'m of water s**-1' = { +'m of water equivalent s**-1' = { discipline = 192 ; parameterCategory = 172 ; parameterNumber = 44 ; } #Snowmelt -'m of water s**-1' = { +'m of water equivalent s**-1' = { discipline = 192 ; parameterCategory = 172 ; parameterNumber = 45 ; @@ -18855,13 +18747,13 @@ parameterNumber = 255 ; } #Snow evaporation anomaly -'m of water s**-1' = { +'m of water equivalent s**-1' = { discipline = 192 ; parameterCategory = 173 ; parameterNumber = 44 ; } #Snowmelt anomaly -'m of water s**-1' = { +'m of water equivalent s**-1' = { discipline = 192 ; parameterCategory = 173 ; parameterNumber = 45 ; @@ -18981,7 +18873,7 @@ parameterNumber = 181 ; } #Evaporation anomalous rate of accumulation -'m of water s**-1' = { +'m of water equivalent s**-1' = { discipline = 192 ; parameterCategory = 173 ; parameterNumber = 182 ; @@ -19238,18 +19130,6 @@ parameterCategory = 174 ; parameterNumber = 183 ; } -#1.5m temperature - maximum in the last 24 hours -'K' = { - discipline = 192 ; - parameterCategory = 174 ; - parameterNumber = 201 ; - } -#1.5m temperature - minimum in the last 24 hours -'K' = { - discipline = 192 ; - parameterCategory = 174 ; - parameterNumber = 202 ; - } #Soil temperature layer 4 'K' = { discipline = 192 ; @@ -19412,18 +19292,6 @@ parameterCategory = 175 ; parameterNumber = 183 ; } -#1.5m temperature - maximum in the last 24 hours -'K' = { - discipline = 192 ; - parameterCategory = 175 ; - parameterNumber = 201 ; - } -#1.5m temperature - minimum in the last 24 hours -'K' = { - discipline = 192 ; - parameterCategory = 175 ; - parameterNumber = 202 ; - } #Soil temperature layer 4 'K' = { discipline = 192 ; @@ -19910,24 +19778,12 @@ parameterCategory = 201 ; parameterNumber = 113 ; } -#deviation of pressure from reference value -'Pa' = { - discipline = 192 ; - parameterCategory = 201 ; - parameterNumber = 139 ; - } #coefficient of horizontal diffusion 'm**2 s**-1' = { discipline = 192 ; parameterCategory = 201 ; parameterNumber = 150 ; } -#Maximum wind velocity -'m s**-1' = { - discipline = 192 ; - parameterCategory = 201 ; - parameterNumber = 187 ; - } #water content of interception store 'kg m**-2' = { discipline = 192 ; diff --git a/definitions/grib2/name.def b/definitions/grib2/name.def index ba2128aa3..3ac979f33 100644 --- a/definitions/grib2/name.def +++ b/definitions/grib2/name.def @@ -5944,12 +5944,6 @@ parameterCategory = 0 ; parameterNumber = 13 ; } -#Minimum dew point depression -'Minimum dew point depression' = { - discipline = 0 ; - parameterCategory = 0 ; - parameterNumber = 14 ; - } #Snow phase change heat flux 'Snow phase change heat flux' = { discipline = 0 ; @@ -6046,18 +6040,6 @@ parameterCategory = 1 ; parameterNumber = 26 ; } -#Maximum relative humidity -'Maximum relative humidity' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 27 ; - } -#Maximum absolute humidity -'Maximum absolute humidity' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 28 ; - } #Total snowfall 'Total snowfall' = { discipline = 0 ; @@ -6265,12 +6247,6 @@ parameterCategory = 1 ; parameterNumber = 68 ; } -#Maximum wind speed -'Maximum wind speed' = { - discipline = 0 ; - parameterCategory = 2 ; - parameterNumber = 21 ; - } #Wind speed (gust) 'Wind speed (gust)' = { discipline = 0 ; @@ -6820,12 +6796,6 @@ parameterCategory = 19 ; parameterNumber = 16 ; } -#Maximum snow albedo -'Maximum snow albedo' = { - discipline = 0 ; - parameterCategory = 19 ; - parameterNumber = 17 ; - } #Snow free albedo 'Snow free albedo' = { discipline = 0 ; @@ -10768,18 +10738,6 @@ parameterCategory = 0 ; parameterNumber = 3 ; } -#Maximum temperature -'Maximum temperature' = { - discipline = 0 ; - parameterCategory = 0 ; - parameterNumber = 4 ; - } -#Minimum temperature -'Minimum temperature' = { - discipline = 0 ; - parameterCategory = 0 ; - parameterNumber = 5 ; - } #Dew point temperature 'Dew point temperature' = { discipline = 0 ; diff --git a/definitions/grib2/paramId.def b/definitions/grib2/paramId.def index 559dfa569..bf4f0fd51 100644 --- a/definitions/grib2/paramId.def +++ b/definitions/grib2/paramId.def @@ -5944,12 +5944,6 @@ parameterCategory = 0 ; parameterNumber = 13 ; } -#Minimum dew point depression -'260006' = { - discipline = 0 ; - parameterCategory = 0 ; - parameterNumber = 14 ; - } #Snow phase change heat flux '260007' = { discipline = 0 ; @@ -6046,18 +6040,6 @@ parameterCategory = 1 ; parameterNumber = 26 ; } -#Maximum relative humidity -'260023' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 27 ; - } -#Maximum absolute humidity -'260024' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 28 ; - } #Total snowfall '260025' = { discipline = 0 ; @@ -6265,12 +6247,6 @@ parameterCategory = 1 ; parameterNumber = 68 ; } -#Maximum wind speed -'260064' = { - discipline = 0 ; - parameterCategory = 2 ; - parameterNumber = 21 ; - } #Wind speed (gust) '260065' = { discipline = 0 ; @@ -6820,12 +6796,6 @@ parameterCategory = 19 ; parameterNumber = 16 ; } -#Maximum snow albedo -'260161' = { - discipline = 0 ; - parameterCategory = 19 ; - parameterNumber = 17 ; - } #Snow free albedo '260162' = { discipline = 0 ; @@ -10768,18 +10738,6 @@ parameterCategory = 0 ; parameterNumber = 3 ; } -#Maximum temperature -'3015' = { - discipline = 0 ; - parameterCategory = 0 ; - parameterNumber = 4 ; - } -#Minimum temperature -'3016' = { - discipline = 0 ; - parameterCategory = 0 ; - parameterNumber = 5 ; - } #Dew point temperature '3017' = { discipline = 0 ; diff --git a/definitions/grib2/shortName.def b/definitions/grib2/shortName.def index d3938a656..13c68c8a1 100644 --- a/definitions/grib2/shortName.def +++ b/definitions/grib2/shortName.def @@ -5944,12 +5944,6 @@ parameterCategory = 0 ; parameterNumber = 13 ; } -#Minimum dew point depression -'mindpd' = { - discipline = 0 ; - parameterCategory = 0 ; - parameterNumber = 14 ; - } #Snow phase change heat flux 'snohf' = { discipline = 0 ; @@ -6046,18 +6040,6 @@ parameterCategory = 1 ; parameterNumber = 26 ; } -#Maximum relative humidity -'maxrh' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 27 ; - } -#Maximum absolute humidity -'maxah' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 28 ; - } #Total snowfall 'asnow' = { discipline = 0 ; @@ -6265,12 +6247,6 @@ parameterCategory = 1 ; parameterNumber = 68 ; } -#Maximum wind speed -'maxgust' = { - discipline = 0 ; - parameterCategory = 2 ; - parameterNumber = 21 ; - } #Wind speed (gust) 'gust' = { discipline = 0 ; @@ -6820,12 +6796,6 @@ parameterCategory = 19 ; parameterNumber = 16 ; } -#Maximum snow albedo -'mxsalb' = { - discipline = 0 ; - parameterCategory = 19 ; - parameterNumber = 17 ; - } #Snow free albedo 'snfalb' = { discipline = 0 ; @@ -10768,18 +10738,6 @@ parameterCategory = 0 ; parameterNumber = 3 ; } -#Maximum temperature -'tmax' = { - discipline = 0 ; - parameterCategory = 0 ; - parameterNumber = 4 ; - } -#Minimum temperature -'tmin' = { - discipline = 0 ; - parameterCategory = 0 ; - parameterNumber = 5 ; - } #Dew point temperature 'dpt' = { discipline = 0 ; diff --git a/definitions/grib2/units.def b/definitions/grib2/units.def index d71fda3c2..535b1caae 100644 --- a/definitions/grib2/units.def +++ b/definitions/grib2/units.def @@ -5944,12 +5944,6 @@ parameterCategory = 0 ; parameterNumber = 13 ; } -#Minimum dew point depression -'K' = { - discipline = 0 ; - parameterCategory = 0 ; - parameterNumber = 14 ; - } #Snow phase change heat flux 'W m**-2' = { discipline = 0 ; @@ -6046,18 +6040,6 @@ parameterCategory = 1 ; parameterNumber = 26 ; } -#Maximum relative humidity -'%' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 27 ; - } -#Maximum absolute humidity -'kg m**-3' = { - discipline = 0 ; - parameterCategory = 1 ; - parameterNumber = 28 ; - } #Total snowfall 'm' = { discipline = 0 ; @@ -6265,12 +6247,6 @@ parameterCategory = 1 ; parameterNumber = 68 ; } -#Maximum wind speed -'m s**-1' = { - discipline = 0 ; - parameterCategory = 2 ; - parameterNumber = 21 ; - } #Wind speed (gust) 'm s**-1' = { discipline = 0 ; @@ -6820,12 +6796,6 @@ parameterCategory = 19 ; parameterNumber = 16 ; } -#Maximum snow albedo -'%' = { - discipline = 0 ; - parameterCategory = 19 ; - parameterNumber = 17 ; - } #Snow free albedo '%' = { discipline = 0 ; @@ -10768,18 +10738,6 @@ parameterCategory = 0 ; parameterNumber = 3 ; } -#Maximum temperature -'K' = { - discipline = 0 ; - parameterCategory = 0 ; - parameterNumber = 4 ; - } -#Minimum temperature -'K' = { - discipline = 0 ; - parameterCategory = 0 ; - parameterNumber = 5 ; - } #Dew point temperature 'K' = { discipline = 0 ; From e78f3be92f80bc13b890693e966b81a0c6a06d79 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Wed, 14 Aug 2024 14:07:46 +0000 Subject: [PATCH 21/27] Testing: Replace tigge_dir. Use bin_dir instead --- tests/definitions.sh | 4 ++-- tests/include.ctest.sh.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/definitions.sh b/tests/definitions.sh index ecd5d5f4a..3842fa973 100755 --- a/tests/definitions.sh +++ b/tests/definitions.sh @@ -18,12 +18,12 @@ tempOut=temp.$label.txt for file in `find ${ECCODES_DEFINITION_PATH}/ -name '*.def' -print | grep -v grib3/ | grep -v metar/ | grep -v taf/` do - ${tools_dir}/codes_parser $file > $REDIRECT + ${bin_dir}/codes_parser $file > $REDIRECT done # Try an invalid input set +e -echo 'transient xx=1' | ${tools_dir}/codes_parser - 2>$tempOut +echo 'transient xx=1' | ${bin_dir}/codes_parser - 2>$tempOut status=$? set -e [ $status -ne 0 ] diff --git a/tests/include.ctest.sh.in b/tests/include.ctest.sh.in index 90473b7ad..416b353d5 100644 --- a/tests/include.ctest.sh.in +++ b/tests/include.ctest.sh.in @@ -37,7 +37,7 @@ export ECCODES_DEFINITION_PATH # binaries are in the TOP CMAKE_BINARY_DIR tools_dir=@CMAKE_BINARY_DIR@/bin -tigge_dir=@CMAKE_BINARY_DIR@/bin +bin_dir=@CMAKE_BINARY_DIR@/bin # If this environment variable is set, then run the # executables with valgrind. See ECC-746 From f0bd218441dbf52a88eec5187fa0e801148a69b9 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Wed, 14 Aug 2024 14:08:39 +0000 Subject: [PATCH 22/27] Examples: Fix valgrind errors --- examples/F90/grib_read_bytes.f90 | 2 +- examples/F90/grib_sections_copy.f90 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/F90/grib_read_bytes.f90 b/examples/F90/grib_read_bytes.f90 index c118bdab4..8333760e4 100644 --- a/examples/F90/grib_read_bytes.f90 +++ b/examples/F90/grib_read_bytes.f90 @@ -13,7 +13,7 @@ program read_bytes integer :: ifile integer :: intsize parameter(intsize=10000) - character, dimension(intsize) :: bufferChar + character, dimension(intsize) :: bufferChar = '' character(len=32) :: input_grib_file = '../../data/v.grib2' call codes_open_file(ifile, input_grib_file, 'r') diff --git a/examples/F90/grib_sections_copy.f90 b/examples/F90/grib_sections_copy.f90 index 93e72675f..bc20f0f6d 100644 --- a/examples/F90/grib_sections_copy.f90 +++ b/examples/F90/grib_sections_copy.f90 @@ -12,7 +12,7 @@ program grib_sections_copy implicit none integer :: igrib_a, igrib_b, igrib_c, iret - character(len=40) :: error_message + character(len=40) :: error_message = '' call codes_grib_new_from_samples(igrib_a, 'regular_ll_sfc_grib1') call codes_grib_new_from_samples(igrib_b, 'reduced_gg_pl_640_grib1') From 72d806c33bef619226291c8ce9dcce5e111a0838 Mon Sep 17 00:00:00 2001 From: shahramn Date: Wed, 14 Aug 2024 17:50:24 +0100 Subject: [PATCH 23/27] Definitions: paramId for conversion --- .../grib1/localConcepts/ecmf/paramIdForConversion.def | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/definitions/grib1/localConcepts/ecmf/paramIdForConversion.def b/definitions/grib1/localConcepts/ecmf/paramIdForConversion.def index 050690c5c..7c609cc70 100644 --- a/definitions/grib1/localConcepts/ecmf/paramIdForConversion.def +++ b/definitions/grib1/localConcepts/ecmf/paramIdForConversion.def @@ -35,11 +35,19 @@ 262139 = {gribTablesVersionNo=151; indicatorOfParameter=132; centre=98;} # 151131 262140 = {gribTablesVersionNo=151; indicatorOfParameter=131; centre=98;} -# +# 72 260087 = {gribTablesVersionNo=128; indicatorOfParameter=72; centre=98;} +# 73 260097 = {gribTablesVersionNo=128; indicatorOfParameter=73; centre=98;} +# 172050 235026 = {gribTablesVersionNo=172; indicatorOfParameter=50; centre=98;} +# 172145 235032 = {gribTablesVersionNo=172; indicatorOfParameter=145; centre=98;} +# 172189 <-- ecCodes 2.38 +# 235189 = {gribTablesVersionNo=172; indicatorOfParameter=189; centre=98;} +# 172195 235045 = {gribTablesVersionNo=172; indicatorOfParameter=195; centre=98;} +# 172196 235046 = {gribTablesVersionNo=172; indicatorOfParameter=196; centre=98;} +# 172197 235047 = {gribTablesVersionNo=172; indicatorOfParameter=197; centre=98;} From 329bec63cd9944bff3336fc69542e47b7ee1d444 Mon Sep 17 00:00:00 2001 From: shahramn Date: Wed, 14 Aug 2024 21:34:27 +0100 Subject: [PATCH 24/27] Testing: count with -f option --- tests/grib_count.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/grib_count.sh b/tests/grib_count.sh index 43b4c2246..b34809a03 100755 --- a/tests/grib_count.sh +++ b/tests/grib_count.sh @@ -19,6 +19,8 @@ for file in ${grib_files}; do ${tools_dir}/grib_count $input done +${tools_dir}/grib_count -f $data_dir/bad.grib + # Specific files count=`${tools_dir}/grib_count ${data_dir}/test.grib1` [ $count -eq 42 ] From 9235522326694044b507de25bbcdc2a821894231 Mon Sep 17 00:00:00 2001 From: shahramn Date: Thu, 15 Aug 2024 10:30:24 +0100 Subject: [PATCH 25/27] Testing: More codes_count tests --- tests/grib_count.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tests/grib_count.sh b/tests/grib_count.sh index b34809a03..c10ae8b90 100755 --- a/tests/grib_count.sh +++ b/tests/grib_count.sh @@ -11,6 +11,7 @@ . ./include.ctest.sh label="grib_count_test" +tempText=temp.$label.txt grib_files=`cat ${data_dir}/grib_data_files.txt` for file in ${grib_files}; do @@ -19,7 +20,16 @@ for file in ${grib_files}; do ${tools_dir}/grib_count $input done +# Bad input ${tools_dir}/grib_count -f $data_dir/bad.grib +cat $data_dir/bad.grib | ${tools_dir}/grib_count -f - + +set +e +${tools_dir}/grib_count $data_dir > $tempText 2>&1 +status=$? +set -e +[ $status -ne 0 ] +grep -q "Is a directory" $tempText # Specific files count=`${tools_dir}/grib_count ${data_dir}/test.grib1` @@ -30,3 +40,6 @@ count=`${tools_dir}/grib_count ${data_dir}/mixed.grib` count=`${tools_dir}/grib_count ${data_dir}/tigge_ecmwf.grib2` [ $count -eq 248 ] + +# Clean up +rm -f $tempText From a12b890e9c9295dc39310627a13193c38e71653b Mon Sep 17 00:00:00 2001 From: shahramn Date: Thu, 15 Aug 2024 10:58:23 +0100 Subject: [PATCH 26/27] Testing: unalias directive (in preparation for ECC-1898) --- tests/grib_mars_keys2.sh | 81 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 80 insertions(+), 1 deletion(-) diff --git a/tests/grib_mars_keys2.sh b/tests/grib_mars_keys2.sh index 2396e0236..224279019 100755 --- a/tests/grib_mars_keys2.sh +++ b/tests/grib_mars_keys2.sh @@ -11,7 +11,9 @@ . ./include.ctest.sh label="grib_mars_keys2_test" +tempOut=temp.${label}.out tempGrib=temp.${label}.grib +tempRef=temp.${label}.ref grib1_sample=$ECCODES_SAMPLES_PATH/GRIB1.tmpl grib2_sample=$ECCODES_SAMPLES_PATH/reduced_gg_pl_32_grib2.tmpl @@ -27,6 +29,82 @@ grib_check_key_equals $tempGrib mars.class,mars.type,mars.stream 'yt em dcwv' grib_check_key_equals $tempGrib marsClass:i,marsType:i,marsStream:i '18 17 1029' +# Check unalias +# ----------------- +${tools_dir}/grib_set -s stream=gfas,type=ga $grib2_sample $tempGrib +${tools_dir}/grib_ls -jm $tempGrib > $tempOut +cat > $tempRef << EOF +{ "messages" : [ + { + "domain": "g", + "date": 20100912, + "time": 1200, + "expver": "0001", + "class": "od", + "type": "ga", + "stream": "gfas", + "step": 0, + "levelist": 1000, + "levtype": "pl", + "param": 130 + } +]} +EOF +diff $tempRef $tempOut + +# This combo unaliases mars.levelist and mars.step +${tools_dir}/grib_set -s stream=gfas,type=gsd $grib2_sample $tempGrib +${tools_dir}/grib_ls -jm $tempGrib > $tempOut +cat > $tempRef << EOF +{ "messages" : [ + { + "domain": "g", + "date": 20100912, + "time": 1200, + "expver": "0001", + "class": "od", + "type": "gsd", + "stream": "gfas", + "param": 130 + } +]} +EOF +diff $tempRef $tempOut +${tools_dir}/grib_dump -Da $grib2_sample > $tempOut +grep -q "g2level level = 1000 .vertical.level, mars.levelist" $tempOut +${tools_dir}/grib_dump -Da $tempGrib > $tempOut +set +e +grep -w levelist $tempOut # dump should not show levelist +status=$? +set -e +[ $status -ne 0 ] + + +# GRIB1 +# This combo unaliases mars.step +${tools_dir}/grib_set -s localDefinitionNumber=31,stream=esmm,type=em $grib1_sample $tempGrib +${tools_dir}/grib_ls -jm $tempGrib > $tempOut +cat > $tempRef << EOF +{ "messages" : [ + { + "domain": "g", + "levtype": "pl", + "levelist": 500, + "time": 1200, + "param": 129.128, + "class": "od", + "type": "em", + "stream": "esmm", + "expver": "0001", + "fcmonth": 0, + "date": 0 + } +]} +EOF +diff $tempRef $tempOut + + + # Check all combinations # ------------------------ i=0 @@ -43,5 +121,6 @@ for cfg in $ECCODES_DEFINITION_PATH/mars/grib.*.*.def; do done echo "Checked $i files" + # Clean up -rm -f $tempGrib +rm -f $tempGrib $tempRef $tempOut From 14cdab4eb8dc1cb3f6e6f8645a535282fd7fc183 Mon Sep 17 00:00:00 2001 From: shahramn Date: Thu, 15 Aug 2024 11:26:34 +0100 Subject: [PATCH 27/27] Testing: bufr_compare --- tests/bufr_compare.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/bufr_compare.sh b/tests/bufr_compare.sh index de19abc1c..4eac4a64e 100755 --- a/tests/bufr_compare.sh +++ b/tests/bufr_compare.sh @@ -339,6 +339,18 @@ set -e [ $status -eq 1 ] grep -q "Summary of different key values" $fLog +# More messages in 2nd file +count1=$(${tools_dir}/bufr_count syno_4.bufr) +count2=$(${tools_dir}/bufr_count syno_multi.bufr) +[ $count1 = 1 ] +[ $count2 = 3 ] +set +e +${tools_dir}/bufr_compare -f syno_4.bufr syno_multi.bufr > $fLog 2>&1 +status=$? +set -e +[ $status -eq 1 ] +grep -q "Different number of messages" $fLog + # ---------------------------------------- # Unreadable message