From f5b10d4c75330daf3903ebf5670b91bf8037b961 Mon Sep 17 00:00:00 2001 From: Sebastien Villaume Date: Fri, 17 Sep 2021 11:33:17 +0100 Subject: [PATCH] keeping only changes to remove is_efas and is_uerra --- definitions/grib2/boot.def | 4 +- definitions/grib2/cfVarName.def | 64 ++++++++----------- definitions/grib2/localConcepts/cnmc/name.def | 19 ++++++ .../grib2/localConcepts/cnmc/paramId.def | 19 ++++++ .../grib2/localConcepts/cnmc/shortName.def | 19 ++++++ .../grib2/localConcepts/cnmc/units.def | 19 ++++++ definitions/grib2/localConcepts/s2s/name.def | 17 ----- .../grib2/localConcepts/s2s/paramId.def | 17 ----- .../grib2/localConcepts/s2s/shortName.def | 17 ----- definitions/grib2/localConcepts/s2s/units.def | 17 ----- .../grib2/localConcepts/tigge/cfVarName.def | 24 ------- .../grib2/localConcepts/tigge/name.def | 24 ------- .../grib2/localConcepts/tigge/paramId.def | 24 ------- .../grib2/localConcepts/tigge/shortName.def | 24 ------- .../grib2/localConcepts/tigge/units.def | 24 ------- definitions/grib2/name.def | 26 ++++++++ definitions/grib2/paramId.def | 26 ++++++++ definitions/grib2/products_s2s.def | 2 +- definitions/grib2/products_tigge.def | 2 +- definitions/grib2/section.4.def | 8 +-- definitions/grib2/shortName.def | 26 ++++++++ definitions/grib2/tables/24/4.5.table | 28 +++----- definitions/grib2/tables/25/4.5.table | 8 +-- definitions/grib2/tables/27/4.5.table | 14 ++-- definitions/grib2/typeOfLevelConcept.def | 4 +- definitions/grib2/units.def | 26 ++++++++ 26 files changed, 236 insertions(+), 266 deletions(-) delete mode 100644 definitions/grib2/localConcepts/s2s/name.def delete mode 100644 definitions/grib2/localConcepts/s2s/paramId.def delete mode 100644 definitions/grib2/localConcepts/s2s/shortName.def delete mode 100644 definitions/grib2/localConcepts/s2s/units.def delete mode 100644 definitions/grib2/localConcepts/tigge/cfVarName.def delete mode 100644 definitions/grib2/localConcepts/tigge/name.def delete mode 100644 definitions/grib2/localConcepts/tigge/paramId.def delete mode 100644 definitions/grib2/localConcepts/tigge/shortName.def delete mode 100644 definitions/grib2/localConcepts/tigge/units.def diff --git a/definitions/grib2/boot.def b/definitions/grib2/boot.def index 03f0ee66c..a3fea39f1 100644 --- a/definitions/grib2/boot.def +++ b/definitions/grib2/boot.def @@ -16,8 +16,8 @@ constant tablesVersionLatest = 27 : edition_specific; constant million = 1000000 : hidden; constant grib2divider = 1000000; alias extraDimensionPresent=zero; -#alias is_tigge = zero; -#alias is_s2s = zero; +alias is_tigge = zero; +alias is_s2s = zero; #transient is_efas = 0; transient angleSubdivisions=grib2divider; # micro degrees diff --git a/definitions/grib2/cfVarName.def b/definitions/grib2/cfVarName.def index 084ddade4..589beb2bc 100644 --- a/definitions/grib2/cfVarName.def +++ b/definitions/grib2/cfVarName.def @@ -113,24 +113,6 @@ parameterCategory = 2 ; parameterNumber = 1 ; } -#Wind speed -'ws' = { - discipline = 0 ; - parameterCategory = 2 ; - parameterNumber = 1 ; - typeOfFirstFixedSurface = 103 ; - scaledValueOfFirstFixedSurface = 100 ; - scaleFactorOfFirstFixedSurface = 0 ; - } -#Wind speed -'ws' = { - discipline = 0 ; - parameterCategory = 2 ; - parameterNumber = 1 ; - typeOfFirstFixedSurface = 103 ; - scaledValueOfFirstFixedSurface = 200 ; - scaleFactorOfFirstFixedSurface = 0 ; - } #Unbalanced component of temperature 'uctp' = { discipline = 0 ; @@ -183,16 +165,6 @@ typeOfSecondFixedSurface = 255 ; typeOfStatisticalProcessing = 1 ; } -#10 metre wind gust since previous post-processing -'fg10' = { - discipline = 0 ; - parameterCategory = 2 ; - parameterNumber = 22 ; - scaleFactorOfFirstFixedSurface = 0 ; - scaledValueOfFirstFixedSurface = 10 ; - typeOfStatisticalProcessing = 2 ; - typeOfFirstFixedSurface = 103 ; - } #Specific rain water content 'crwc' = { discipline = 0 ; @@ -263,16 +235,6 @@ parameterCategory = 2 ; parameterNumber = 37 ; } -#Maximum temperature at 2 metres since previous post-processing -'mx2t' = { - discipline = 0 ; - parameterCategory = 0 ; - parameterNumber = 0 ; - typeOfFirstFixedSurface = 103 ; - scaleFactorOfFirstFixedSurface = 0 ; - scaledValueOfFirstFixedSurface = 2 ; - typeOfStatisticalProcessing = 2 ; - } #Ozone mass mixing ratio 'o3' = { discipline = 0 ; @@ -4731,12 +4693,38 @@ parameterCategory = 0 ; parameterNumber = 22 ; } +#Soil Moisture +'sm' = { + discipline = 2 ; + parameterCategory = 0 ; + parameterNumber = 22 ; + typeOfSecondFixedSurface = 106 ; + typeOfFirstFixedSurface = 106 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfFirstFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 2 ; + scaleFactorOfSecondFixedSurface = 1 ; + is_tigge = 1 ; + } #Soil Temperature 'st' = { discipline = 2 ; parameterCategory = 0 ; parameterNumber = 2 ; } +#Soil Temperature +'st' = { + discipline = 2 ; + parameterCategory = 0 ; + parameterNumber = 2 ; + scaledValueOfFirstFixedSurface = 0 ; + typeOfSecondFixedSurface = 106 ; + scaledValueOfSecondFixedSurface = 2 ; + scaleFactorOfSecondFixedSurface = 1 ; + typeOfFirstFixedSurface = 106 ; + scaleFactorOfFirstFixedSurface = 0 ; + is_tigge = 1 ; + } #Snow depth water equivalent 'sd' = { discipline = 0 ; diff --git a/definitions/grib2/localConcepts/cnmc/name.def b/definitions/grib2/localConcepts/cnmc/name.def index bdabd3447..43a9b0f0b 100644 --- a/definitions/grib2/localConcepts/cnmc/name.def +++ b/definitions/grib2/localConcepts/cnmc/name.def @@ -5,6 +5,14 @@ parameterCategory = 2 ; parameterNumber = 0 ; } +#Sea ice area fraction +'Sea ice area fraction' = { + discipline = 10 ; + parameterCategory = 2 ; + parameterNumber = 0 ; + subCentre = 102 ; + is_s2s = 1 ; + } #2 metre dewpoint temperature '2 metre dewpoint temperature' = { discipline = 0 ; @@ -14,6 +22,17 @@ scaledValueOfFirstFixedSurface = 2 ; scaleFactorOfFirstFixedSurface = 0 ; } +#2 metre dewpoint temperature +'2 metre dewpoint temperature' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 6 ; + typeOfFirstFixedSurface = 103 ; + scaledValueOfFirstFixedSurface = 2 ; + scaleFactorOfFirstFixedSurface = 0 ; + subCentre = 102 ; + is_s2s = 1 ; + } #Pressure (S) (not reduced) 'Pressure (S) (not reduced)' = { discipline = 0 ; diff --git a/definitions/grib2/localConcepts/cnmc/paramId.def b/definitions/grib2/localConcepts/cnmc/paramId.def index 6721c08d6..a0a324fe6 100644 --- a/definitions/grib2/localConcepts/cnmc/paramId.def +++ b/definitions/grib2/localConcepts/cnmc/paramId.def @@ -5,6 +5,14 @@ parameterCategory = 2 ; parameterNumber = 0 ; } +#Sea ice area fraction +'31' = { + discipline = 10 ; + parameterCategory = 2 ; + parameterNumber = 0 ; + subCentre = 102 ; + is_s2s = 1 ; + } #2 metre dewpoint temperature '168' = { discipline = 0 ; @@ -14,6 +22,17 @@ scaledValueOfFirstFixedSurface = 2 ; scaleFactorOfFirstFixedSurface = 0 ; } +#2 metre dewpoint temperature +'168' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 6 ; + typeOfFirstFixedSurface = 103 ; + scaledValueOfFirstFixedSurface = 2 ; + scaleFactorOfFirstFixedSurface = 0 ; + subCentre = 102 ; + is_s2s = 1 ; + } #Pressure (S) (not reduced) '500000' = { discipline = 0 ; diff --git a/definitions/grib2/localConcepts/cnmc/shortName.def b/definitions/grib2/localConcepts/cnmc/shortName.def index 71bcf2db5..2d0496ee2 100644 --- a/definitions/grib2/localConcepts/cnmc/shortName.def +++ b/definitions/grib2/localConcepts/cnmc/shortName.def @@ -5,6 +5,14 @@ parameterCategory = 2 ; parameterNumber = 0 ; } +#Sea ice area fraction +'ci' = { + discipline = 10 ; + parameterCategory = 2 ; + parameterNumber = 0 ; + subCentre = 102 ; + is_s2s = 1 ; + } #2 metre dewpoint temperature '2d' = { discipline = 0 ; @@ -14,6 +22,17 @@ scaledValueOfFirstFixedSurface = 2 ; scaleFactorOfFirstFixedSurface = 0 ; } +#2 metre dewpoint temperature +'2d' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 6 ; + typeOfFirstFixedSurface = 103 ; + scaledValueOfFirstFixedSurface = 2 ; + scaleFactorOfFirstFixedSurface = 0 ; + subCentre = 102 ; + is_s2s = 1 ; + } #Pressure (S) (not reduced) 'ps' = { discipline = 0 ; diff --git a/definitions/grib2/localConcepts/cnmc/units.def b/definitions/grib2/localConcepts/cnmc/units.def index 37051c5aa..177655a57 100644 --- a/definitions/grib2/localConcepts/cnmc/units.def +++ b/definitions/grib2/localConcepts/cnmc/units.def @@ -5,6 +5,14 @@ parameterCategory = 2 ; parameterNumber = 0 ; } +#Sea ice area fraction +'(0 - 1)' = { + discipline = 10 ; + parameterCategory = 2 ; + parameterNumber = 0 ; + subCentre = 102 ; + is_s2s = 1 ; + } #2 metre dewpoint temperature 'K' = { discipline = 0 ; @@ -14,6 +22,17 @@ scaledValueOfFirstFixedSurface = 2 ; scaleFactorOfFirstFixedSurface = 0 ; } +#2 metre dewpoint temperature +'K' = { + discipline = 0 ; + parameterCategory = 0 ; + parameterNumber = 6 ; + typeOfFirstFixedSurface = 103 ; + scaledValueOfFirstFixedSurface = 2 ; + scaleFactorOfFirstFixedSurface = 0 ; + subCentre = 102 ; + is_s2s = 1 ; + } #Pressure (S) (not reduced) 'Pa' = { discipline = 0 ; diff --git a/definitions/grib2/localConcepts/s2s/name.def b/definitions/grib2/localConcepts/s2s/name.def deleted file mode 100644 index 3bb3ed9a5..000000000 --- a/definitions/grib2/localConcepts/s2s/name.def +++ /dev/null @@ -1,17 +0,0 @@ -#Sea ice area fraction -'Sea ice area fraction' = { - discipline = 10 ; - parameterCategory = 2 ; - parameterNumber = 0 ; - subCentre = 102 ; - } -#2 metre dewpoint temperature -'2 metre dewpoint temperature' = { - discipline = 0 ; - parameterCategory = 0 ; - parameterNumber = 6 ; - typeOfFirstFixedSurface = 103 ; - scaledValueOfFirstFixedSurface = 2 ; - scaleFactorOfFirstFixedSurface = 0 ; - subCentre = 102 ; - } diff --git a/definitions/grib2/localConcepts/s2s/paramId.def b/definitions/grib2/localConcepts/s2s/paramId.def deleted file mode 100644 index f2bcf79bf..000000000 --- a/definitions/grib2/localConcepts/s2s/paramId.def +++ /dev/null @@ -1,17 +0,0 @@ -#Sea ice area fraction -'31' = { - discipline = 10 ; - parameterCategory = 2 ; - parameterNumber = 0 ; - subCentre = 102 ; - } -#2 metre dewpoint temperature -'168' = { - discipline = 0 ; - parameterCategory = 0 ; - parameterNumber = 6 ; - typeOfFirstFixedSurface = 103 ; - scaledValueOfFirstFixedSurface = 2 ; - scaleFactorOfFirstFixedSurface = 0 ; - subCentre = 102 ; - } diff --git a/definitions/grib2/localConcepts/s2s/shortName.def b/definitions/grib2/localConcepts/s2s/shortName.def deleted file mode 100644 index 6d210a750..000000000 --- a/definitions/grib2/localConcepts/s2s/shortName.def +++ /dev/null @@ -1,17 +0,0 @@ -#Sea ice area fraction -'ci' = { - discipline = 10 ; - parameterCategory = 2 ; - parameterNumber = 0 ; - subCentre = 102 ; - } -#2 metre dewpoint temperature -'2d' = { - discipline = 0 ; - parameterCategory = 0 ; - parameterNumber = 6 ; - typeOfFirstFixedSurface = 103 ; - scaledValueOfFirstFixedSurface = 2 ; - scaleFactorOfFirstFixedSurface = 0 ; - subCentre = 102 ; - } diff --git a/definitions/grib2/localConcepts/s2s/units.def b/definitions/grib2/localConcepts/s2s/units.def deleted file mode 100644 index 2b0a562ab..000000000 --- a/definitions/grib2/localConcepts/s2s/units.def +++ /dev/null @@ -1,17 +0,0 @@ -#Sea ice area fraction -'(0 - 1)' = { - discipline = 10 ; - parameterCategory = 2 ; - parameterNumber = 0 ; - subCentre = 102 ; - } -#2 metre dewpoint temperature -'K' = { - discipline = 0 ; - parameterCategory = 0 ; - parameterNumber = 6 ; - typeOfFirstFixedSurface = 103 ; - scaledValueOfFirstFixedSurface = 2 ; - scaleFactorOfFirstFixedSurface = 0 ; - subCentre = 102 ; - } diff --git a/definitions/grib2/localConcepts/tigge/cfVarName.def b/definitions/grib2/localConcepts/tigge/cfVarName.def deleted file mode 100644 index d6762bcdc..000000000 --- a/definitions/grib2/localConcepts/tigge/cfVarName.def +++ /dev/null @@ -1,24 +0,0 @@ -#Soil Moisture -'sm' = { - discipline = 2 ; - parameterCategory = 0 ; - parameterNumber = 22 ; - typeOfSecondFixedSurface = 106 ; - typeOfFirstFixedSurface = 106 ; - scaleFactorOfFirstFixedSurface = 0 ; - scaledValueOfFirstFixedSurface = 0 ; - scaledValueOfSecondFixedSurface = 2 ; - scaleFactorOfSecondFixedSurface = 1 ; - } -#Soil Temperature -'st' = { - discipline = 2 ; - parameterCategory = 0 ; - parameterNumber = 2 ; - scaledValueOfFirstFixedSurface = 0 ; - typeOfSecondFixedSurface = 106 ; - scaledValueOfSecondFixedSurface = 2 ; - scaleFactorOfSecondFixedSurface = 1 ; - typeOfFirstFixedSurface = 106 ; - scaleFactorOfFirstFixedSurface = 0 ; - } diff --git a/definitions/grib2/localConcepts/tigge/name.def b/definitions/grib2/localConcepts/tigge/name.def deleted file mode 100644 index b79c43cef..000000000 --- a/definitions/grib2/localConcepts/tigge/name.def +++ /dev/null @@ -1,24 +0,0 @@ -#Soil Moisture -'Soil Moisture' = { - discipline = 2 ; - parameterCategory = 0 ; - parameterNumber = 22 ; - typeOfFirstFixedSurface = 106 ; - typeOfSecondFixedSurface = 106 ; - scaledValueOfFirstFixedSurface = 0 ; - scaleFactorOfFirstFixedSurface = 0 ; - scaledValueOfSecondFixedSurface = 2 ; - scaleFactorOfSecondFixedSurface = 1 ; - } -#Soil Temperature -'Soil Temperature' = { - discipline = 2 ; - parameterCategory = 0 ; - parameterNumber = 2 ; - typeOfFirstFixedSurface = 106 ; - typeOfSecondFixedSurface = 106 ; - scaledValueOfFirstFixedSurface = 0 ; - scaleFactorOfFirstFixedSurface = 0 ; - scaledValueOfSecondFixedSurface = 2 ; - scaleFactorOfSecondFixedSurface = 1 ; -} diff --git a/definitions/grib2/localConcepts/tigge/paramId.def b/definitions/grib2/localConcepts/tigge/paramId.def deleted file mode 100644 index 0d906699f..000000000 --- a/definitions/grib2/localConcepts/tigge/paramId.def +++ /dev/null @@ -1,24 +0,0 @@ -#Soil Moisture -'228039' = { - discipline = 2 ; - parameterCategory = 0 ; - parameterNumber = 22 ; - typeOfFirstFixedSurface = 106 ; - typeOfSecondFixedSurface = 106 ; - scaledValueOfFirstFixedSurface = 0 ; - scaleFactorOfFirstFixedSurface = 0 ; - scaledValueOfSecondFixedSurface = 2 ; - scaleFactorOfSecondFixedSurface = 1 ; - } -#Soil Temperature -'228139' = { - discipline = 2 ; - parameterCategory = 0 ; - parameterNumber = 2 ; - typeOfFirstFixedSurface = 106 ; - typeOfSecondFixedSurface = 106 ; - scaledValueOfFirstFixedSurface = 0 ; - scaleFactorOfFirstFixedSurface = 0 ; - scaledValueOfSecondFixedSurface = 2 ; - scaleFactorOfSecondFixedSurface = 1 ; - } diff --git a/definitions/grib2/localConcepts/tigge/shortName.def b/definitions/grib2/localConcepts/tigge/shortName.def deleted file mode 100644 index 16ddd8763..000000000 --- a/definitions/grib2/localConcepts/tigge/shortName.def +++ /dev/null @@ -1,24 +0,0 @@ -#Soil Moisture -'sm' = { - discipline = 2 ; - parameterCategory = 0 ; - parameterNumber = 22 ; - typeOfFirstFixedSurface = 106 ; - typeOfSecondFixedSurface = 106 ; - scaledValueOfFirstFixedSurface = 0 ; - scaleFactorOfFirstFixedSurface = 0 ; - scaledValueOfSecondFixedSurface = 2 ; - scaleFactorOfSecondFixedSurface = 1 ; - } -#Soil Temperature -'st' = { - discipline = 2 ; - parameterCategory = 0 ; - parameterNumber = 2 ; - typeOfFirstFixedSurface = 106 ; - typeOfSecondFixedSurface = 106 ; - scaledValueOfFirstFixedSurface = 0 ; - scaleFactorOfFirstFixedSurface = 0 ; - scaledValueOfSecondFixedSurface = 2 ; - scaleFactorOfSecondFixedSurface = 1 ; - } diff --git a/definitions/grib2/localConcepts/tigge/units.def b/definitions/grib2/localConcepts/tigge/units.def deleted file mode 100644 index 2971af794..000000000 --- a/definitions/grib2/localConcepts/tigge/units.def +++ /dev/null @@ -1,24 +0,0 @@ -#Soil Moisture -'kg m**-3' = { - discipline = 2 ; - parameterCategory = 0 ; - parameterNumber = 22 ; - typeOfFirstFixedSurface = 106 ; - typeOfSecondFixedSurface = 106 ; - scaledValueOfFirstFixedSurface = 0 ; - scaleFactorOfFirstFixedSurface = 0 ; - scaledValueOfSecondFixedSurface = 2 ; - scaleFactorOfSecondFixedSurface = 1 ; - } -#Soil Temperature -'K' = { - discipline = 2 ; - parameterCategory = 0 ; - parameterNumber = 2 ; - typeOfFirstFixedSurface = 106 ; - typeOfSecondFixedSurface = 106 ; - scaledValueOfFirstFixedSurface = 0 ; - scaleFactorOfFirstFixedSurface = 0 ; - scaledValueOfSecondFixedSurface = 2 ; - scaleFactorOfSecondFixedSurface = 1 ; - } diff --git a/definitions/grib2/name.def b/definitions/grib2/name.def index 74bb8a210..62d3ff6ac 100644 --- a/definitions/grib2/name.def +++ b/definitions/grib2/name.def @@ -4693,12 +4693,38 @@ parameterCategory = 0 ; parameterNumber = 22 ; } +#Soil Moisture +'Soil Moisture' = { + discipline = 2 ; + parameterCategory = 0 ; + parameterNumber = 22 ; + typeOfFirstFixedSurface = 106 ; + typeOfSecondFixedSurface = 106 ; + scaledValueOfFirstFixedSurface = 0 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 2 ; + scaleFactorOfSecondFixedSurface = 1 ; + is_tigge = 1 ; + } #Soil Temperature 'Soil Temperature' = { discipline = 2 ; parameterCategory = 0 ; parameterNumber = 2 ; } +#Soil Temperature +'Soil Temperature' = { + discipline = 2 ; + parameterCategory = 0 ; + parameterNumber = 2 ; + typeOfFirstFixedSurface = 106 ; + typeOfSecondFixedSurface = 106 ; + scaledValueOfFirstFixedSurface = 0 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 2 ; + scaleFactorOfSecondFixedSurface = 1 ; + is_tigge = 1 ; + } #Snow depth water equivalent 'Snow depth water equivalent' = { discipline = 0 ; diff --git a/definitions/grib2/paramId.def b/definitions/grib2/paramId.def index c81359224..5baf2aeae 100644 --- a/definitions/grib2/paramId.def +++ b/definitions/grib2/paramId.def @@ -4693,12 +4693,38 @@ parameterCategory = 0 ; parameterNumber = 22 ; } +#Soil Moisture +'228039' = { + discipline = 2 ; + parameterCategory = 0 ; + parameterNumber = 22 ; + typeOfFirstFixedSurface = 106 ; + typeOfSecondFixedSurface = 106 ; + scaledValueOfFirstFixedSurface = 0 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 2 ; + scaleFactorOfSecondFixedSurface = 1 ; + is_tigge = 1 ; + } #Soil Temperature '228139' = { discipline = 2 ; parameterCategory = 0 ; parameterNumber = 2 ; } +#Soil Temperature +'228139' = { + discipline = 2 ; + parameterCategory = 0 ; + parameterNumber = 2 ; + typeOfFirstFixedSurface = 106 ; + typeOfSecondFixedSurface = 106 ; + scaledValueOfFirstFixedSurface = 0 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 2 ; + scaleFactorOfSecondFixedSurface = 1 ; + is_tigge = 1 ; + } #Snow depth water equivalent '228141' = { discipline = 0 ; diff --git a/definitions/grib2/products_s2s.def b/definitions/grib2/products_s2s.def index 99e686f73..48d09e587 100644 --- a/definitions/grib2/products_s2s.def +++ b/definitions/grib2/products_s2s.def @@ -3,7 +3,7 @@ # S2S constant marsClass = 's2'; constant marsModel = 'glob'; -#alias is_s2s = one; +alias is_s2s = one; alias parameter.paramId=paramId; alias parameter.shortName=shortName; diff --git a/definitions/grib2/products_tigge.def b/definitions/grib2/products_tigge.def index adf79db7f..9a3a4ae81 100644 --- a/definitions/grib2/products_tigge.def +++ b/definitions/grib2/products_tigge.def @@ -3,7 +3,7 @@ # Tigge constant marsClass = 'ti'; constant marsModel = 'glob'; -#alias is_tigge = one; +alias is_tigge = one; alias tigge_short_name=shortName; alias short_name=shortName; diff --git a/definitions/grib2/section.4.def b/definitions/grib2/section.4.def index b49b235ce..c40755c2e 100644 --- a/definitions/grib2/section.4.def +++ b/definitions/grib2/section.4.def @@ -24,10 +24,10 @@ if (centre==7 || centre==46) { } concept datasetForLocal(unknown) { - "tigge" = {productionStatusOfProcessedData=4;} - "tigge" = {productionStatusOfProcessedData=5;} - "s2s" = {productionStatusOfProcessedData=6;} - "s2s" = {productionStatusOfProcessedData=7;} +# "tigge" = {productionStatusOfProcessedData=4;} +# "tigge" = {productionStatusOfProcessedData=5;} +# "s2s" = {productionStatusOfProcessedData=6;} +# "s2s" = {productionStatusOfProcessedData=7;} "hydro" = {marsClass="ce";} # EFAS/GLOFAS "hydro" = {marsClass="ul";} #ULYSSES "uerra" = {productionStatusOfProcessedData=8;} # UERRA diff --git a/definitions/grib2/shortName.def b/definitions/grib2/shortName.def index 239871d9a..1392bd480 100644 --- a/definitions/grib2/shortName.def +++ b/definitions/grib2/shortName.def @@ -4693,12 +4693,38 @@ parameterCategory = 0 ; parameterNumber = 22 ; } +#Soil Moisture +'sm' = { + discipline = 2 ; + parameterCategory = 0 ; + parameterNumber = 22 ; + typeOfFirstFixedSurface = 106 ; + typeOfSecondFixedSurface = 106 ; + scaledValueOfFirstFixedSurface = 0 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 2 ; + scaleFactorOfSecondFixedSurface = 1 ; + is_tigge = 1 ; + } #Soil Temperature 'st' = { discipline = 2 ; parameterCategory = 0 ; parameterNumber = 2 ; } +#Soil Temperature +'st' = { + discipline = 2 ; + parameterCategory = 0 ; + parameterNumber = 2 ; + typeOfFirstFixedSurface = 106 ; + typeOfSecondFixedSurface = 106 ; + scaledValueOfFirstFixedSurface = 0 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 2 ; + scaleFactorOfSecondFixedSurface = 1 ; + is_tigge = 1 ; + } #Snow depth water equivalent 'sd' = { discipline = 0 ; diff --git a/definitions/grib2/tables/24/4.5.table b/definitions/grib2/tables/24/4.5.table index 65e7052e8..a6840e55e 100644 --- a/definitions/grib2/tables/24/4.5.table +++ b/definitions/grib2/tables/24/4.5.table @@ -13,9 +13,9 @@ 11 11 Cumulonimbus (CB) base (m) 12 12 Cumulonimbus (CB) top (m) 13 13 Lowest level where vertically integrated cloud cover exceeds the specified percentage (cloud base for a given percentage cloud cover) (%) -14 14 Level of free convection (LFC) (-) -15 15 Convective condensation level (CCL) (-) -16 16 Level of neutral buoyancy or equilibrium level (LNB) (-) +14 14 Level of free convection (LFC) +15 15 Convective condensation level (CCL) +16 16 Level of neutral buoyancy or equilibrium level (LNB) # 17-19 Reserved 20 20 Isothermal level (K) 21 21 Lowest level where mass density exceeds the specified value (base for a given threshold of mass density) (kg m-3) @@ -23,14 +23,7 @@ 23 23 Lowest level where air concentration exceeds the specified value (base for a given threshold of air concentration) (Bq m-3) 24 24 Highest level where air concentration exceeds the specified value (top for a given threshold of air concentration) (Bq m-3) 25 25 Highest level where radar reflectivity exceeds the specified value (echo top for a given threshold of reflectivity) (dBZ) -# 26-29 Reserved -30 30 Specified radius from the center of the Sun (m) -31 31 Solar photosphere -32 32 Ionospheric D-region level -33 33 Ionospheric E-region level -34 34 Ionospheric F1-region level -35 35 Ionospheric F2-region level -# 36-99 Reserved +# 26-99 Reserved 100 pl Isobaric surface (Pa) 101 sfc Mean sea level 102 102 Specific altitude above mean sea level (m) @@ -45,7 +38,7 @@ 111 111 Eta level (-) 112 112 Reserved 113 113 Logarithmic hybrid level -114 sol Snow level (Numeric) +114 114 Snow level (Numeric) 115 115 Sigma height level # 116 Reserved 117 117 Mixed layer depth (m) @@ -54,9 +47,8 @@ # 120-149 Reserved 150 150 Generalized vertical height coordinate 151 sol Soil level (Numeric) -152 sol Sea ice level (Numeric) -# 153-159 Reserved -160 o2d Depth below sea level (m) +# 152-159 Reserved +160 160 Depth below sea level (m) 161 161 Depth below water surface (m) 162 sfc Lake or river bottom (-) 163 163 Bottom of sediment layer (-) @@ -64,9 +56,9 @@ 165 165 Bottom of sediment layer penetrated by thermal wave (-) 166 sfc Mixing layer (-) 167 167 Bottom of root zone (-) -168 o3d Ocean model level (Numeric) -169 o2d Ocean level defined by water density (sigma-theta) difference from near-surface to level (kg m-3) -170 o2d Ocean level defined by water potential temperature difference from near-surface to level (K) +168 168 Ocean model level (Numeric) +169 169 Ocean level defined by water density (sigma-theta) difference from near-surface to level (kg m-3) +170 170 Ocean level defined by water potential temperature difference from near-surface to level (K) # 171-173 Reserved 174 sfc Top surface of ice on sea, lake or river 175 175 Top surface of ice, under snow cover, on sea, lake or river diff --git a/definitions/grib2/tables/25/4.5.table b/definitions/grib2/tables/25/4.5.table index 65e7052e8..98d6308ac 100644 --- a/definitions/grib2/tables/25/4.5.table +++ b/definitions/grib2/tables/25/4.5.table @@ -56,7 +56,7 @@ 151 sol Soil level (Numeric) 152 sol Sea ice level (Numeric) # 153-159 Reserved -160 o2d Depth below sea level (m) +160 160 Depth below sea level (m) 161 161 Depth below water surface (m) 162 sfc Lake or river bottom (-) 163 163 Bottom of sediment layer (-) @@ -64,9 +64,9 @@ 165 165 Bottom of sediment layer penetrated by thermal wave (-) 166 sfc Mixing layer (-) 167 167 Bottom of root zone (-) -168 o3d Ocean model level (Numeric) -169 o2d Ocean level defined by water density (sigma-theta) difference from near-surface to level (kg m-3) -170 o2d Ocean level defined by water potential temperature difference from near-surface to level (K) +168 168 Ocean model level (Numeric) +169 169 Ocean level defined by water density (sigma-theta) difference from near-surface to level (kg m-3) +170 170 Ocean level defined by water potential temperature difference from near-surface to level (K) # 171-173 Reserved 174 sfc Top surface of ice on sea, lake or river 175 175 Top surface of ice, under snow cover, on sea, lake or river diff --git a/definitions/grib2/tables/27/4.5.table b/definitions/grib2/tables/27/4.5.table index f040f8bca..c3d56dfb6 100644 --- a/definitions/grib2/tables/27/4.5.table +++ b/definitions/grib2/tables/27/4.5.table @@ -19,7 +19,7 @@ 17 sfc Departure level of the most unstable parcel of air (MUDL) 18 sfc Departure level of a mixed layer parcel of air with specified layer depth (Pa) # 19 Reserved -20 o2d Isothermal level (K) +20 20 Isothermal level (K) 21 21 Lowest level where mass density exceeds the specified value (base for a given threshold of mass density) (kg m-3) 22 22 Highest level where mass density exceeds the specified value (top for a given threshold of mass density) (kg m-3) 23 23 Lowest level where air concentration exceeds the specified value (base for a given threshold of air concentration) (Bq m-3) @@ -58,7 +58,7 @@ 151 sol Soil level (Numeric) 152 sol Sea-ice level (Numeric) # 153-159 Reserved -160 o2d Depth below sea level (m) +160 160 Depth below sea level (m) 161 161 Depth below water surface (m) 162 sfc Lake or river bottom (-) 163 163 Bottom of sediment layer (-) @@ -66,12 +66,12 @@ 165 165 Bottom of sediment layer penetrated by thermal wave (-) 166 sfc Mixing layer (-) 167 167 Bottom of root zone (-) -168 o3d Ocean model level (Numeric) -169 o2d Ocean level defined by water density (sigma-theta) difference from near-surface to level (kg m-3) -170 o2d Ocean level defined by water potential temperature difference from near-surface to level (K) +168 168 Ocean model level (Numeric) +169 169 Ocean level defined by water density (sigma-theta) difference from near-surface to level (kg m-3) +170 170 Ocean level defined by water potential temperature difference from near-surface to level (K) # 171-173 Reserved -174 o2d Top surface of ice on sea, lake or river -175 o2d Top surface of ice, under snow cover, on sea, lake or river +174 sfc Top surface of ice on sea, lake or river +175 175 Top surface of ice, under snow cover, on sea, lake or river 176 176 Bottom surface (underside) ice on sea, lake or river 177 sfc Deep soil (of indefinite depth) # 178 Reserved diff --git a/definitions/grib2/typeOfLevelConcept.def b/definitions/grib2/typeOfLevelConcept.def index 2ab82bfc8..f39a33095 100644 --- a/definitions/grib2/typeOfLevelConcept.def +++ b/definitions/grib2/typeOfLevelConcept.def @@ -41,9 +41,7 @@ 'generalVerticalLayer' = {genVertHeightCoords=1; typeOfFirstFixedSurface=150; typeOfSecondFixedSurface=150; NV=6;} 'depthBelowSea' = {typeOfFirstFixedSurface=160; typeOfSecondFixedSurface=255;} 'oceanSurface' = {typeOfFirstFixedSurface=160; scaleFactorOfFirstFixedSurface=0; scaledValueOfFirstFixedSurface=0; typeOfSecondFixedSurface=255;} -'oceanDepthLayer' = {typeOfFirstFixedSurface=160; typeOfSecondFixedSurface=160;} -'oceanModelLevel' = {typeOfFirstFixedSurface=168; typeOfSecondFixedSurface=255;} -'oceanModelLayer' = {typeOfFirstFixedSurface=168; typeOfSecondFixedSurface=168;} +'oceanLayer' = {typeOfFirstFixedSurface=160; typeOfSecondFixedSurface=160;} 'entireAtmosphere' = {typeOfFirstFixedSurface=1; typeOfSecondFixedSurface=8;} 'entireOcean' = {typeOfFirstFixedSurface=1; typeOfSecondFixedSurface=9;} 'snow' = {typeOfFirstFixedSurface=114; typeOfSecondFixedSurface=255;} diff --git a/definitions/grib2/units.def b/definitions/grib2/units.def index e96670959..5134eefe2 100644 --- a/definitions/grib2/units.def +++ b/definitions/grib2/units.def @@ -4693,12 +4693,38 @@ parameterCategory = 0 ; parameterNumber = 22 ; } +#Soil Moisture +'kg m**-3' = { + discipline = 2 ; + parameterCategory = 0 ; + parameterNumber = 22 ; + typeOfFirstFixedSurface = 106 ; + typeOfSecondFixedSurface = 106 ; + scaledValueOfFirstFixedSurface = 0 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 2 ; + scaleFactorOfSecondFixedSurface = 1 ; + is_tigge = 1 ; + } #Soil Temperature 'K' = { discipline = 2 ; parameterCategory = 0 ; parameterNumber = 2 ; } +#Soil Temperature +'K' = { + discipline = 2 ; + parameterCategory = 0 ; + parameterNumber = 2 ; + typeOfFirstFixedSurface = 106 ; + typeOfSecondFixedSurface = 106 ; + scaledValueOfFirstFixedSurface = 0 ; + scaleFactorOfFirstFixedSurface = 0 ; + scaledValueOfSecondFixedSurface = 2 ; + scaleFactorOfSecondFixedSurface = 1 ; + is_tigge = 1 ; + } #Snow depth water equivalent 'kg m**-2' = { discipline = 0 ;