From 65dda35cc6861388a1c86c7eee1eefbe1bce7376 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Mon, 14 Feb 2022 17:00:58 +0000
Subject: [PATCH 1/2] ECC-1342: Fix cfVarName files

---
 definitions/grib2/cfVarName.def               | 1061 -----------------
 .../grib2/localConcepts/s2s/cfVarName.def     |   26 +-
 2 files changed, 21 insertions(+), 1066 deletions(-)

diff --git a/definitions/grib2/cfVarName.def b/definitions/grib2/cfVarName.def
index b2f026616..a54bf4199 100644
--- a/definitions/grib2/cfVarName.def
+++ b/definitions/grib2/cfVarName.def
@@ -5594,1067 +5594,6 @@
 	 typeOfStatisticalProcessing = 1 ;
 }
 #Sea ice thickness
-'sithick' = {
-  discipline = 10 ;
-  parameterCategory = 2 ;
-  parameterNumber = 1 ;
-  typeOfFirstFixedSurface = 174 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = missing() ;
-  scaleFactorOfFirstFixedSurface = missing() ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-}
-#Sea ice area fraction
-'siconc' = {
-  discipline = 10 ;
-  parameterCategory = 2 ;
-  parameterNumber = 0 ;
-  typeOfFirstFixedSurface = 174 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = missing() ;
-  scaleFactorOfFirstFixedSurface = missing() ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-}
-#Sea ice snow thickness
-'sisnthick' = {
-  discipline = 0 ;
-  parameterCategory = 1 ;
-  parameterNumber = 11 ;
-  typeOfFirstFixedSurface = 174 ;
-  typeOfSecondFixedSurface = 176 ;
-  scaledValueOfFirstFixedSurface = missing() ;
-  scaleFactorOfFirstFixedSurface = missing() ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-}
-#Sea ice x velocity
-'siue' = {
-  discipline = 10 ;
-  parameterCategory = 2 ;
-  parameterNumber = 4 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-}
-#Sea ice y velocity
-'sivn' = {
-  discipline = 10 ;
-  parameterCategory = 2 ;
-  parameterNumber = 5 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-}
-#Sea ice albedo
-'sialb' = {
-  discipline = 0 ;
-  parameterCategory = 19 ;
-  parameterNumber = 1 ;
-  typeOfFirstFixedSurface = 174 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = missing() ;
-  scaleFactorOfFirstFixedSurface = missing() ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-}
-#Sea ice surface temperature
-'sitemptop' = {
-  discipline = 10 ;
-  parameterCategory = 2 ;
-  parameterNumber = 8 ;
-  typeOfFirstFixedSurface = 174 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = missing() ;
-  scaleFactorOfFirstFixedSurface = missing() ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-}
-#Ice growth
-'sigrowth' = {
-  discipline = 10 ;
-  parameterCategory = 2 ;
-  parameterNumber = 6 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-}
-#Sea surface salinity
-'sos' = {
-  discipline = 10 ;
-  parameterCategory = 3 ;
-  parameterNumber = 3 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-}
-#Sea surface temperature
-'tos' = {
-  discipline = 10 ;
-  parameterCategory = 3 ;
-  parameterNumber = 0 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-}
-#Depth of 14C isotherm
-'t14d' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 14 ;
-  typeOfFirstFixedSurface = 20 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 28715 ;
-  scaleFactorOfFirstFixedSurface = 2 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-}
-#Depth of 17C isotherm
-'t17d' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 14 ;
-  typeOfFirstFixedSurface = 20 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 29015 ;
-  scaleFactorOfFirstFixedSurface = 2 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-}
-#Depth of 20C isotherm
-'t20d' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 14 ;
-  typeOfFirstFixedSurface = 20 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 29315 ;
-  scaleFactorOfFirstFixedSurface = 2 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-}
-#Depth of 26C isotherm
-'t26d' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 14 ;
-  typeOfFirstFixedSurface = 20 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 29915 ;
-  scaleFactorOfFirstFixedSurface = 2 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-}
-#Depth of 28C isotherm
-'t28d' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 14 ;
-  typeOfFirstFixedSurface = 20 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 30115 ;
-  scaleFactorOfFirstFixedSurface = 2 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-}
-#Barotropic stream function
-'stfbarot' = {
-  discipline = 10 ;
-  parameterCategory = 191 ;
-  parameterNumber = 4 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 5 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-}
-#Surface downward heat flux
-'hfds' = {
-  discipline = 10 ;
-  parameterCategory = 3 ;
-  parameterNumber = 4 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-}
-#Northward surface stress
-'tauvon' = {
-  discipline = 10 ;
-  parameterCategory = 3 ;
-  parameterNumber = 6 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-}
-#Eastward surface stress
-'tauuoe' = {
-  discipline = 10 ;
-  parameterCategory = 3 ;
-  parameterNumber = 5 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-}
-#Y component of surface stress
-'tauvo' = {
-  discipline = 10 ;
-  parameterCategory = 3 ;
-  parameterNumber = 8 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-}
-#X component of surface stress
-'tauuo' = {
-  discipline = 10 ;
-  parameterCategory = 3 ;
-  parameterNumber = 7 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-}
-#Ocean mixed layer depth defind by sigme theta 0.01 kg m-3
-'mlotst010' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 14 ;
-  typeOfFirstFixedSurface = 169 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 1 ;
-  scaleFactorOfFirstFixedSurface = 2 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-}
-#Ocean mixed layer depth defind by sigme theta 0.03 kg m-3
-'mlotst030' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 14 ;
-  typeOfFirstFixedSurface = 169 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 3 ;
-  scaleFactorOfFirstFixedSurface = 2 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-}
-#Ocean mixed layer depth defind by sigme theta 0.125 kg m-3
-'mlotst125' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 14 ;
-  typeOfFirstFixedSurface = 169 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 125 ;
-  scaleFactorOfFirstFixedSurface = 3 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-}
-#Ocean mixed layer depth  defined by temperature 0.2 C
-'mlott02' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 14 ;
-  typeOfFirstFixedSurface = 170 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 2 ;
-  scaleFactorOfFirstFixedSurface = 1 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-}
-#Ocean mixed layer depth  defined by temperature 0.5 C
-'mlott05' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 14 ;
-  typeOfFirstFixedSurface = 170 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 5 ;
-  scaleFactorOfFirstFixedSurface = 1 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-}
-#Integral of sea water practical salinity in the upper 300m
-'sc300m' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 21 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 160 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = 300 ;
-  scaleFactorOfSecondFixedSurface = 0 ;
-}
-#Integral of sea water practical salinity in the upper 700m
-'sc700m' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 21 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 160 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = 700 ;
-  scaleFactorOfSecondFixedSurface = 0 ;
-}
-#Integral of sea water practical salinity in the total water column
-'scbtm' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 21 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 9 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-}
-#Water column integrated heat content in the upper 300 m
-'hc300m' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 22 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 160 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = 300 ;
-  scaleFactorOfSecondFixedSurface = 0 ;
-}
-#Water column integrated heat content in the upper 700m
-'hc700m' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 22 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 160 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = 700 ;
-  scaleFactorOfSecondFixedSurface = 0 ;
-}
-#Water column integrated heat content in the total water column
-'hcbtm' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 22 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 160 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-}
-#Sea surface height
-'zos' = {
-  discipline = 10 ;
-  parameterCategory = 3 ;
-  parameterNumber = 1 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-}
-#Steric change in sea surface height
-'stheig' = {
-  discipline = 10 ;
-  parameterCategory = 3 ;
-  parameterNumber = 11 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-}
-#Halosteric change in sea surface height
-'hstheig' = {
-  discipline = 10 ;
-  parameterCategory = 3 ;
-  parameterNumber = 10 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-}
-#Thermosteric change in sea surface height
-'tstheig' = {
-  discipline = 10 ;
-  parameterCategory = 3 ;
-  parameterNumber = 9 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-}
-#Thermocline depth
-'thcline' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 0 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-}
-#Sea water practical salinity
-'so' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 21 ;
-  typeOfFirstFixedSurface = 168 ;
-  typeOfSecondFixedSurface = 168 ;
-}
-#Sea water potential temperature
-'thetao' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 18 ;
-  typeOfFirstFixedSurface = 168 ;
-  typeOfSecondFixedSurface = 168 ;
-}
-#Sea water sigma theta
-'sigmat' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 20 ;
-  typeOfFirstFixedSurface = 168 ;
-  typeOfSecondFixedSurface = 168 ;
-}
-#Y component of sea water velocity
-'vo' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 26 ;
-  typeOfFirstFixedSurface = 168 ;
-  typeOfSecondFixedSurface = 168 ;
-}
-#X component of sea water velocity
-'uo' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 25 ;
-  typeOfFirstFixedSurface = 168 ;
-  typeOfSecondFixedSurface = 168 ;
-}
-#Northward sea water velocity
-'von' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 24 ;
-  typeOfFirstFixedSurface = 168 ;
-  typeOfSecondFixedSurface = 168 ;
-}
-#Eastward sea water velocity
-'uoe' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 23 ;
-  typeOfFirstFixedSurface = 168 ;
-  typeOfSecondFixedSurface = 168 ;
-}
-#Upward sea water velocity
-'wo' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 27 ;
-  typeOfFirstFixedSurface = 168 ;
-  typeOfSecondFixedSurface = 168 ;
-}
-#Sea ice thickness
-'sithick_avg' = {
-  discipline = 10 ;
-  parameterCategory = 2 ;
-  parameterNumber = 1 ;
-  typeOfFirstFixedSurface = 174 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = missing() ;
-  scaleFactorOfFirstFixedSurface = missing() ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Sea ice area fraction
-'siconc_avg' = {
-  discipline = 10 ;
-  parameterCategory = 2 ;
-  parameterNumber = 0 ;
-  typeOfFirstFixedSurface = 174 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = missing() ;
-  scaleFactorOfFirstFixedSurface = missing() ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Sea ice snow thickness
-'sisnthick_avg' = {
-  discipline = 0 ;
-  parameterCategory = 1 ;
-  parameterNumber = 11 ;
-  typeOfFirstFixedSurface = 174 ;
-  typeOfSecondFixedSurface = 176 ;
-  scaledValueOfFirstFixedSurface = missing() ;
-  scaleFactorOfFirstFixedSurface = missing() ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Sea ice x velocity
-'siue_avg' = {
-  discipline = 10 ;
-  parameterCategory = 2 ;
-  parameterNumber = 4 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Sea ice y velocity
-'sivn_avg' = {
-  discipline = 10 ;
-  parameterCategory = 2 ;
-  parameterNumber = 5 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Sea ice albedo
-'sialb_avg' = {
-  discipline = 0 ;
-  parameterCategory = 19 ;
-  parameterNumber = 1 ;
-  typeOfFirstFixedSurface = 174 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = missing() ;
-  scaleFactorOfFirstFixedSurface = missing() ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Sea ice surface temperature
-'sitemptop_avg' = {
-  discipline = 10 ;
-  parameterCategory = 2 ;
-  parameterNumber = 8 ;
-  typeOfFirstFixedSurface = 174 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = missing() ;
-  scaleFactorOfFirstFixedSurface = missing() ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Ice growth
-'sigrowth_avg' = {
-  discipline = 10 ;
-  parameterCategory = 2 ;
-  parameterNumber = 6 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Sea surface salinity
-'sos_avg' = {
-  discipline = 10 ;
-  parameterCategory = 3 ;
-  parameterNumber = 3 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Sea surface temperature
-'tos_avg' = {
-  discipline = 10 ;
-  parameterCategory = 3 ;
-  parameterNumber = 0 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Depth of 14C isotherm
-'t14d_avg' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 14 ;
-  typeOfFirstFixedSurface = 20 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 28715 ;
-  scaleFactorOfFirstFixedSurface = 2 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Depth of 17C isotherm
-'t17d_avg' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 14 ;
-  typeOfFirstFixedSurface = 20 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 29015 ;
-  scaleFactorOfFirstFixedSurface = 2 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Depth of 20C isotherm
-'t20d_avg' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 14 ;
-  typeOfFirstFixedSurface = 20 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 29315 ;
-  scaleFactorOfFirstFixedSurface = 2 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Depth of 26C isotherm
-'t26d_avg' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 14 ;
-  typeOfFirstFixedSurface = 20 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 29915 ;
-  scaleFactorOfFirstFixedSurface = 2 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Depth of 28C isotherm
-'t28d_avg' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 14 ;
-  typeOfFirstFixedSurface = 20 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 30115 ;
-  scaleFactorOfFirstFixedSurface = 2 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Barotropic stream function
-'stfbarot_avg' = {
-  discipline = 10 ;
-  parameterCategory = 191 ;
-  parameterNumber = 4 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 5 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Surface downward heat flux
-'hfds_avg' = {
-  discipline = 10 ;
-  parameterCategory = 3 ;
-  parameterNumber = 4 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Northward surface stress
-'tauvon_avg' = {
-  discipline = 10 ;
-  parameterCategory = 3 ;
-  parameterNumber = 6 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Eastward surface stress
-'tauuoe_avg' = {
-  discipline = 10 ;
-  parameterCategory = 3 ;
-  parameterNumber = 5 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Y component of surface stress
-'tauvo_avg' = {
-  discipline = 10 ;
-  parameterCategory = 3 ;
-  parameterNumber = 8 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#X component of surface stress
-'tauuo_avg' = {
-  discipline = 10 ;
-  parameterCategory = 3 ;
-  parameterNumber = 7 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Ocean mixed layer depth defind by sigme theta 0.01 kg m-3
-'mlotst010_avg' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 14 ;
-  typeOfFirstFixedSurface = 169 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 1 ;
-  scaleFactorOfFirstFixedSurface = 2 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Ocean mixed layer depth defind by sigme theta 0.03 kg m-3
-'mlotst030_avg' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 14 ;
-  typeOfFirstFixedSurface = 169 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 3 ;
-  scaleFactorOfFirstFixedSurface = 2 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Ocean mixed layer depth defind by sigme theta 0.125 kg m-3
-'mlotst125_avg' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 14 ;
-  typeOfFirstFixedSurface = 169 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 125 ;
-  scaleFactorOfFirstFixedSurface = 3 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Ocean mixed layer depth  defined by temperature 0.2 C
-'mlott02_avg' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 14 ;
-  typeOfFirstFixedSurface = 170 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 2 ;
-  scaleFactorOfFirstFixedSurface = 1 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Ocean mixed layer depth  defined by temperature 0.5 C
-'mlott05_avg' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 14 ;
-  typeOfFirstFixedSurface = 170 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 5 ;
-  scaleFactorOfFirstFixedSurface = 1 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Integral of sea water practical salinity in the upper 300m
-'sc300m_avg' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 21 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 160 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = 300 ;
-  scaleFactorOfSecondFixedSurface = 0 ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Integral of sea water practical salinity in the upper 700m
-'sc700m_avg' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 21 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 160 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = 700 ;
-  scaleFactorOfSecondFixedSurface = 0 ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Integral of sea water practical salinity in the total water column
-'scbtm_avg' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 21 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 9 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Water column integrated heat content in the upper 300 m
-'hc300m_avg' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 22 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 160 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = 300 ;
-  scaleFactorOfSecondFixedSurface = 0 ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Water column integrated heat content in the upper 700m
-'hc700m_avg' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 22 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 160 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = 700 ;
-  scaleFactorOfSecondFixedSurface = 0 ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Water column integrated heat content in the total water column
-'hcbtm_avg' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 22 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 160 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Sea surface height
-'zos_avg' = {
-  discipline = 10 ;
-  parameterCategory = 3 ;
-  parameterNumber = 1 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Steric change in sea surface height
-'stheig_avg' = {
-  discipline = 10 ;
-  parameterCategory = 3 ;
-  parameterNumber = 11 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Halosteric change in sea surface height
-'hstheig_avg' = {
-  discipline = 10 ;
-  parameterCategory = 3 ;
-  parameterNumber = 10 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Thermosteric change in sea surface height
-'tstheig_avg' = {
-  discipline = 10 ;
-  parameterCategory = 3 ;
-  parameterNumber = 9 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Thermocline depth
-'thcline_avg' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 0 ;
-  typeOfFirstFixedSurface = 160 ;
-  typeOfSecondFixedSurface = 255 ;
-  scaledValueOfFirstFixedSurface = 0 ;
-  scaleFactorOfFirstFixedSurface = 0 ;
-  scaledValueOfSecondFixedSurface = missing() ;
-  scaleFactorOfSecondFixedSurface = missing() ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Sea water practical salinity
-'so_avg' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 21 ;
-  typeOfFirstFixedSurface = 168 ;
-  typeOfSecondFixedSurface = 168 ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Sea water potential temperature
-'thetao_avg' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 18 ;
-  typeOfFirstFixedSurface = 168 ;
-  typeOfSecondFixedSurface = 168 ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Sea water sigma theta
-'sigmat_avg' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 20 ;
-  typeOfFirstFixedSurface = 168 ;
-  typeOfSecondFixedSurface = 168 ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Y component of sea water velocity
-'vo_avg' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 26 ;
-  typeOfFirstFixedSurface = 168 ;
-  typeOfSecondFixedSurface = 168 ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#X component of sea water velocity
-'uo_avg' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 25 ;
-  typeOfFirstFixedSurface = 168 ;
-  typeOfSecondFixedSurface = 168 ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Northward sea water velocity
-'von_avg' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 24 ;
-  typeOfFirstFixedSurface = 168 ;
-  typeOfSecondFixedSurface = 168 ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Eastward sea water velocity
-'uoe_avg' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 23 ;
-  typeOfFirstFixedSurface = 168 ;
-  typeOfSecondFixedSurface = 168 ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Upward sea water velocity
-'wo_avg' = {
-  discipline = 10 ;
-  parameterCategory = 4 ;
-  parameterNumber = 27 ;
-  typeOfFirstFixedSurface = 168 ;
-  typeOfSecondFixedSurface = 168 ;
-  typeOfStatisticalProcessing = 0 ;
-}
-#Sea ice thickness
 'sithick' = {
   discipline = 10 ;
   parameterCategory = 2 ;
diff --git a/definitions/grib2/localConcepts/s2s/cfVarName.def b/definitions/grib2/localConcepts/s2s/cfVarName.def
index 004440b51..7f41a2984 100644
--- a/definitions/grib2/localConcepts/s2s/cfVarName.def
+++ b/definitions/grib2/localConcepts/s2s/cfVarName.def
@@ -1,3 +1,19 @@
+# Automatically generated by ./create_def.pl, do not edit
+#Sea ice area fraction
+'ci' = {
+	 discipline = 10 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 0 ;
+	}
+#2 metre dewpoint temperature
+'d2m' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 6 ;
+	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
+}
 #Mean sea water potential temperature in the upper 300 m
 'mswpt300m' = {
      discipline = 10 ;
@@ -25,22 +41,22 @@
      discipline = 10 ;
      parameterCategory = 4 ;
      parameterNumber = 14 ;
-     typeOfSecondFixedSurface = 255 ;
      typeOfFirstFixedSurface = 20 ;
-     scaleFactorOfFirstFixedSurface = 2 ;
+     typeOfSecondFixedSurface = 255 ;
      scaledValueOfFirstFixedSurface = 29315 ;
+     scaleFactorOfFirstFixedSurface = 2 ;
     }
 #Average salinity in the upper 300m
 'sav300' = {
      discipline = 10 ;
      parameterCategory = 4 ;
      parameterNumber = 21 ;
-     typeOfSecondFixedSurface = 160 ;
      typeOfFirstFixedSurface = 160 ;
+     typeOfSecondFixedSurface = 160 ;
      scaledValueOfFirstFixedSurface = 0 ;
+     scaleFactorOfFirstFixedSurface = 0 ;
      scaledValueOfSecondFixedSurface = 300 ;
      scaleFactorOfSecondFixedSurface = 0 ;
-     scaleFactorOfFirstFixedSurface = 0 ;
     }
 #Sea surface practical salinity
 'sos' = {
@@ -57,10 +73,10 @@
      discipline = 10 ;
      parameterCategory = 4 ;
      parameterNumber = 14 ;
+     typeOfFirstFixedSurface = 169 ;
      typeOfSecondFixedSurface = 255 ;
      scaledValueOfFirstFixedSurface = 1 ;
      scaleFactorOfFirstFixedSurface = 2 ;
-     typeOfFirstFixedSurface = 169 ;
     }
 #Sea-ice thickness
 'sithick' = {

From fc6d0108e3629c24f53e526d1121e3c73ec06255 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Mon, 14 Feb 2022 18:06:35 +0000
Subject: [PATCH 2/2] ECC-1342: Fix levtypes for UERRA params 260649 and 260650

---
 tests/grib_ecc-1319.sh | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/tests/grib_ecc-1319.sh b/tests/grib_ecc-1319.sh
index 2a2057b3b..f221e5187 100755
--- a/tests/grib_ecc-1319.sh
+++ b/tests/grib_ecc-1319.sh
@@ -12,8 +12,10 @@
 set -u
 
 label="grib_ecc-1319-test"
-temp=temp.$label.grib
 
+temp=temp.$label.grib
+temp1=temp1.$label.grib
+temp2=temp2.$label.grib
 sample_grib2=$ECCODES_SAMPLES_PATH/GRIB2.tmpl
 
 typeOfLevels="
@@ -65,12 +67,13 @@ done
 
 # Also check specific cases
 # --------------------------
-# Sea ice surface temperature
-${tools_dir}/grib_set -s paramId=260649 $sample_grib2 $temp
-grib_check_key_equals $temp levtype o2d
-# Snow on ice total depth
-${tools_dir}/grib_set -s paramId=260650 $sample_grib2 $temp
-grib_check_key_equals $temp levtype o2d
+# 260649 = Sea ice surface temperature (UERRA)
+${tools_dir}/grib_set -s productionStatusOfProcessedData=8 $sample_grib2 $temp1
+${tools_dir}/grib_set -s paramId=260649 $temp1 $temp2
+grib_check_key_equals $temp2 levtype sfc
+# 260650 = Snow on ice total depth (UERRA)
+${tools_dir}/grib_set -s paramId=260650 $temp1 $temp2
+grib_check_key_equals $temp2 levtype sfc
 
 # Lake ice surface temperature
 ${tools_dir}/grib_set -s paramId=228013 $sample_grib2 $temp
@@ -81,4 +84,4 @@ grib_check_key_equals $temp levtype sfc
 
 
 
-rm -f $temp
+rm -f $temp $temp1 $temp2