Merge branch 'feature/ECC-1466-GRIB2Defs' into develop

data/tigge_pf_ecmwf.grib2.ref

@@ -3,7 +3,7 @@ ecmf 166 10v m s**-1 10 metre V wind component
 ecmf 59 cape J kg**-1 Convective available potential energy
 ecmf 156 gh gpm Geopotential height
 ecmf 151 msl Pa Mean sea level pressure
-ecmf 179 ttr J m**-2 Top net long-wave radiation
+ecmf 179 ttr J m**-2 Top net long-wave (thermal) radiation
 ecmf 3 pt K Potential temperature
 ecmf 60 pv K m**2 kg**-1 s**-1 Potential vorticity
 ecmf 235 skt K Skin temperature
@@ -18,15 +18,15 @@ ecmf 121 mx2t6 K Maximum temperature at 2 metres in the last 6 hours
 ecmf 122 mn2t6 K Minimum temperature at 2 metres in the last 6 hours
 ecmf 167 2t K 2 metre temperature
 ecmf 147 slhf J m**-2 Surface latent heat flux
-ecmf 176 ssr J m**-2 Surface net short-wave radiation
+ecmf 176 ssr J m**-2 Surface net short-wave (solar) radiation
-ecmf 177 str J m**-2 Surface net long-wave radiation
+ecmf 177 str J m**-2 Surface net long-wave (thermal) radiation
 ecmf 134 sp Pa Surface pressure
 ecmf 146 sshf J m**-2 Surface sensible heat flux
 ecmf 130 t K Temperature
-ecmf 179 ttr J m**-2 Top net long-wave radiation
+ecmf 179 ttr J m**-2 Top net long-wave (thermal) radiation
 ecmf 147 slhf J m**-2 Surface latent heat flux
-ecmf 176 ssr J m**-2 Surface net short-wave radiation
+ecmf 176 ssr J m**-2 Surface net short-wave (solar) radiation
-ecmf 177 str J m**-2 Surface net long-wave radiation
+ecmf 177 str J m**-2 Surface net long-wave (thermal) radiation
 ecmf 146 sshf J m**-2 Surface sensible heat flux
 ecmf 228164 tcc % Total Cloud Cover
 ecmf 136 tcw kg m**-2 Total column water

definitions/grib1/localConcepts/ecmf/cfName.def

@@ -449,12 +449,12 @@
 	 table2Version = 190 ;
 	 indicatorOfParameter = 164 ;
 	}
-#Surface short-wave radiation downwards
+#Surface short-wave (solar) radiation downwards
 'surface_downwelling_shortwave_flux_in_air' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 169 ;
 	}
-#Surface short-wave radiation downwards
+#Surface short-wave (solar) radiation downwards
 'surface_downwelling_shortwave_flux_in_air' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 169 ;
@@ -519,72 +519,72 @@
 	 table2Version = 190 ;
 	 indicatorOfParameter = 174 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'surface_net_downward_shortwave_flux' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'surface_net_downward_shortwave_flux' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'surface_net_downward_shortwave_flux' = {
 	 table2Version = 170 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'surface_net_downward_shortwave_flux' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'surface_net_upward_longwave_flux' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'surface_net_upward_longwave_flux' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'surface_net_upward_longwave_flux' = {
 	 table2Version = 170 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'surface_net_upward_longwave_flux' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 'toa_net_upward_shortwave_flux' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 'toa_net_upward_shortwave_flux' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 'toa_net_upward_shortwave_flux' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 'toa_outgoing_longwave_flux' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 179 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 'toa_outgoing_longwave_flux' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 179 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 'toa_outgoing_longwave_flux' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 179 ;
@@ -664,12 +664,12 @@
 	 table2Version = 128 ;
 	 indicatorOfParameter = 206 ;
 	}
-#Surface net short-wave radiation, clear sky
+#Surface net short-wave (solar) radiation, clear sky
 'surface_net_downward_shortwave_flux_assuming_clear_sky' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 210 ;
 	}
-#Surface net long-wave radiation, clear sky
+#Surface net long-wave (thermal) radiation, clear sky
 'surface_net_downward_longwave_flux_assuming_clear_sky' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 211 ;

definitions/grib1/localConcepts/ecmf/cfVarName.def

@@ -1294,12 +1294,12 @@
 	 table2Version = 190 ;
 	 indicatorOfParameter = 168 ;
 	}
-#Surface short-wave radiation downwards
+#Surface short-wave (solar) radiation downwards
 'ssrd' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 169 ;
 	}
-#Surface short-wave radiation downwards
+#Surface short-wave (solar) radiation downwards
 'ssrd' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 169 ;
@@ -1379,82 +1379,82 @@
 	 table2Version = 190 ;
 	 indicatorOfParameter = 174 ;
 	}
-#Surface long-wave radiation downwards
+#Surface long-wave (thermal) radiation downwards
 'strd' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 175 ;
 	}
-#Surface long-wave radiation downwards
+#Surface long-wave (thermal) radiation downwards
 'strd' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 175 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'ssr' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'ssr' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'ssr' = {
 	 table2Version = 170 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'ssr' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'str' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'str' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'str' = {
 	 table2Version = 170 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'str' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 'tsr' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 'tsr' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 'tsr' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 'ttr' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 179 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 'ttr' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 179 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 'ttr' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 179 ;
@@ -1749,12 +1749,12 @@
 	 table2Version = 128 ;
 	 indicatorOfParameter = 209 ;
 	}
-#Surface net short-wave radiation, clear sky
+#Surface net short-wave (solar) radiation, clear sky
 'ssrc' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 210 ;
 	}
-#Surface net long-wave radiation, clear sky
+#Surface net long-wave (thermal) radiation, clear sky
 'strc' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 211 ;
@@ -5879,6 +5879,361 @@
 	 table2Version = 213 ;
 	 indicatorOfParameter = 150 ;
 	}
+#Random pattern 51 for SPP scheme
+'spp51' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 151 ;
+	}
+#Random pattern 52 for SPP scheme
+'spp52' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 152 ;
+	}
+#Random pattern 53 for SPP scheme
+'spp53' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 153 ;
+	}
+#Random pattern 54 for SPP scheme
+'spp54' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 154 ;
+	}
+#Random pattern 55 for SPP scheme
+'spp55' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 155 ;
+	}
+#Random pattern 56 for SPP scheme
+'spp56' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 156 ;
+	}
+#Random pattern 57 for SPP scheme
+'spp57' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 157 ;
+	}
+#Random pattern 58 for SPP scheme
+'spp58' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 158 ;
+	}
+#Random pattern 59 for SPP scheme
+'spp59' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 159 ;
+	}
+#Random pattern 60 for SPP scheme
+'spp60' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 160 ;
+	}
+#Random pattern 61 for SPP scheme
+'spp61' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 161 ;
+	}
+#Random pattern 62 for SPP scheme
+'spp62' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 162 ;
+	}
+#Random pattern 63 for SPP scheme
+'spp63' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 163 ;
+	}
+#Random pattern 64 for SPP scheme
+'spp64' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 164 ;
+	}
+#Random pattern 65 for SPP scheme
+'spp65' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 165 ;
+	}
+#Random pattern 66 for SPP scheme
+'spp66' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 166 ;
+	}
+#Random pattern 67 for SPP scheme
+'spp67' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 167 ;
+	}
+#Random pattern 68 for SPP scheme
+'spp68' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 168 ;
+	}
+#Random pattern 69 for SPP scheme
+'spp69' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 169 ;
+	}
+#Random pattern 70 for SPP scheme
+'spp70' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 170 ;
+	}
+#Random pattern 71 for SPP scheme
+'spp71' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 171 ;
+	}
+#Random pattern 72 for SPP scheme
+'spp72' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 172 ;
+	}
+#Random pattern 73 for SPP scheme
+'spp73' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 173 ;
+	}
+#Random pattern 74 for SPP scheme
+'spp74' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 174 ;
+	}
+#Random pattern 75 for SPP scheme
+'spp75' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 175 ;
+	}
+#Random pattern 76 for SPP scheme
+'spp76' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 176 ;
+	}
+#Random pattern 77 for SPP scheme
+'spp77' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 177 ;
+	}
+#Random pattern 78 for SPP scheme
+'spp78' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 178 ;
+	}
+#Random pattern 79 for SPP scheme
+'spp79' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 179 ;
+	}
+#Random pattern 80 for SPP scheme
+'spp80' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 180 ;
+	}
+#Random pattern 81 for SPP scheme
+'spp81' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 181 ;
+	}
+#Random pattern 82 for SPP scheme
+'spp82' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 182 ;
+	}
+#Random pattern 83 for SPP scheme
+'spp83' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 183 ;
+	}
+#Random pattern 84 for SPP scheme
+'spp84' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 184 ;
+	}
+#Random pattern 85 for SPP scheme
+'spp85' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 185 ;
+	}
+#Random pattern 86 for SPP scheme
+'spp86' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 186 ;
+	}
+#Random pattern 87 for SPP scheme
+'spp87' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 187 ;
+	}
+#Random pattern 88 for SPP scheme
+'spp88' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 188 ;
+	}
+#Random pattern 89 for SPP scheme
+'spp89' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 189 ;
+	}
+#Random pattern 90 for SPP scheme
+'spp90' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 190 ;
+	}
+#Random pattern 91 for SPP scheme
+'spp91' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 191 ;
+	}
+#Random pattern 92 for SPP scheme
+'spp92' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 192 ;
+	}
+#Random pattern 93 for SPP scheme
+'spp93' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 193 ;
+	}
+#Random pattern 94 for SPP scheme
+'spp94' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 194 ;
+	}
+#Random pattern 95 for SPP scheme
+'spp95' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 195 ;
+	}
+#Random pattern 96 for SPP scheme
+'spp96' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 196 ;
+	}
+#Random pattern 97 for SPP scheme
+'spp97' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 197 ;
+	}
+#Random pattern 98 for SPP scheme
+'spp98' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 198 ;
+	}
+#Random pattern 99 for SPP scheme
+'spp99' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 199 ;
+	}
+#Random pattern 100 for SPP scheme
+'spp100' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 200 ;
+	}
+#Random pattern 101 for SPP scheme
+'spp101' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 201 ;
+	}
+#Random pattern 102 for SPP scheme
+'spp102' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 202 ;
+	}
+#Random pattern 103 for SPP scheme
+'spp103' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 203 ;
+	}
+#Random pattern 104 for SPP scheme
+'spp104' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 204 ;
+	}
+#Random pattern 105 for SPP scheme
+'spp105' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 205 ;
+	}
+#Random pattern 106 for SPP scheme
+'spp106' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 206 ;
+	}
+#Random pattern 107 for SPP scheme
+'spp107' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 207 ;
+	}
+#Random pattern 108 for SPP scheme
+'spp108' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 208 ;
+	}
+#Random pattern 109 for SPP scheme
+'spp109' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 209 ;
+	}
+#Random pattern 110 for SPP scheme
+'spp110' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 210 ;
+	}
+#Random pattern 111 for SPP scheme
+'spp111' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 211 ;
+	}
+#Random pattern 112 for SPP scheme
+'spp112' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 212 ;
+	}
+#Random pattern 113 for SPP scheme
+'spp113' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 213 ;
+	}
+#Random pattern 114 for SPP scheme
+'spp114' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 214 ;
+	}
+#Random pattern 115 for SPP scheme
+'spp115' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 215 ;
+	}
+#Random pattern 116 for SPP scheme
+'spp116' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 216 ;
+	}
+#Random pattern 117 for SPP scheme
+'spp117' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 217 ;
+	}
+#Random pattern 118 for SPP scheme
+'spp118' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 218 ;
+	}
+#Random pattern 119 for SPP scheme
+'spp119' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 219 ;
+	}
+#Random pattern 120 for SPP scheme
+'spp120' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 220 ;
+	}
+#Random pattern 121 for SPP scheme
+'spp121' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 221 ;
+	}
 #Cosine of solar zenith angle
 'uvcossza' = {
 	 table2Version = 214 ;

definitions/grib1/localConcepts/ecmf/name.def

@@ -1294,13 +1294,13 @@
 	 table2Version = 190 ;
 	 indicatorOfParameter = 168 ;
 	}
-#Surface short-wave radiation downwards
+#Surface short-wave (solar) radiation downwards
-'Surface short-wave radiation downwards' = {
+'Surface short-wave (solar) radiation downwards' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 169 ;
 	}
-#Surface short-wave radiation downwards
+#Surface short-wave (solar) radiation downwards
-'Surface short-wave radiation downwards' = {
+'Surface short-wave (solar) radiation downwards' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 169 ;
 	}
@@ -1379,83 +1379,83 @@
 	 table2Version = 190 ;
 	 indicatorOfParameter = 174 ;
 	}
-#Surface long-wave radiation downwards
+#Surface long-wave (thermal) radiation downwards
-'Surface long-wave radiation downwards' = {
+'Surface long-wave (thermal) radiation downwards' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 175 ;
 	}
-#Surface long-wave radiation downwards
+#Surface long-wave (thermal) radiation downwards
-'Surface long-wave radiation downwards' = {
+'Surface long-wave (thermal) radiation downwards' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 175 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
-'Surface net short-wave radiation' = {
+'Surface net short-wave (solar) radiation' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
-'Surface net short-wave radiation' = {
+'Surface net short-wave (solar) radiation' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
-'Surface net short-wave radiation' = {
+'Surface net short-wave (solar) radiation' = {
 	 table2Version = 170 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
-'Surface net short-wave radiation' = {
+'Surface net short-wave (solar) radiation' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
-'Surface net long-wave radiation' = {
+'Surface net long-wave (thermal) radiation' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
-'Surface net long-wave radiation' = {
+'Surface net long-wave (thermal) radiation' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
-'Surface net long-wave radiation' = {
+'Surface net long-wave (thermal) radiation' = {
 	 table2Version = 170 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
-'Surface net long-wave radiation' = {
+'Surface net long-wave (thermal) radiation' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
-'Top net short-wave radiation' = {
+'Top net short-wave (solar) radiation' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
-'Top net short-wave radiation' = {
+'Top net short-wave (solar) radiation' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
-'Top net short-wave radiation' = {
+'Top net short-wave (solar) radiation' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
-'Top net long-wave radiation' = {
+'Top net long-wave (thermal) radiation' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 179 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
-'Top net long-wave radiation' = {
+'Top net long-wave (thermal) radiation' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 179 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
-'Top net long-wave radiation' = {
+'Top net long-wave (thermal) radiation' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 179 ;
 	}
@@ -1749,13 +1749,13 @@
 	 table2Version = 128 ;
 	 indicatorOfParameter = 209 ;
 	}
-#Surface net short-wave radiation, clear sky
+#Surface net short-wave (solar) radiation, clear sky
-'Surface net short-wave radiation, clear sky' = {
+'Surface net short-wave (solar) radiation, clear sky' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 210 ;
 	}
-#Surface net long-wave radiation, clear sky
+#Surface net long-wave (thermal) radiation, clear sky
-'Surface net long-wave radiation, clear sky' = {
+'Surface net long-wave (thermal) radiation, clear sky' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 211 ;
 	}
@@ -5879,6 +5879,361 @@
 	 table2Version = 213 ;
 	 indicatorOfParameter = 150 ;
 	}
+#Random pattern 51 for SPP scheme
+'Random pattern 51 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 151 ;
+	}
+#Random pattern 52 for SPP scheme
+'Random pattern 52 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 152 ;
+	}
+#Random pattern 53 for SPP scheme
+'Random pattern 53 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 153 ;
+	}
+#Random pattern 54 for SPP scheme
+'Random pattern 54 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 154 ;
+	}
+#Random pattern 55 for SPP scheme
+'Random pattern 55 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 155 ;
+	}
+#Random pattern 56 for SPP scheme
+'Random pattern 56 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 156 ;
+	}
+#Random pattern 57 for SPP scheme
+'Random pattern 57 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 157 ;
+	}
+#Random pattern 58 for SPP scheme
+'Random pattern 58 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 158 ;
+	}
+#Random pattern 59 for SPP scheme
+'Random pattern 59 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 159 ;
+	}
+#Random pattern 60 for SPP scheme
+'Random pattern 60 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 160 ;
+	}
+#Random pattern 61 for SPP scheme
+'Random pattern 61 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 161 ;
+	}
+#Random pattern 62 for SPP scheme
+'Random pattern 62 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 162 ;
+	}
+#Random pattern 63 for SPP scheme
+'Random pattern 63 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 163 ;
+	}
+#Random pattern 64 for SPP scheme
+'Random pattern 64 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 164 ;
+	}
+#Random pattern 65 for SPP scheme
+'Random pattern 65 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 165 ;
+	}
+#Random pattern 66 for SPP scheme
+'Random pattern 66 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 166 ;
+	}
+#Random pattern 67 for SPP scheme
+'Random pattern 67 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 167 ;
+	}
+#Random pattern 68 for SPP scheme
+'Random pattern 68 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 168 ;
+	}
+#Random pattern 69 for SPP scheme
+'Random pattern 69 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 169 ;
+	}
+#Random pattern 70 for SPP scheme
+'Random pattern 70 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 170 ;
+	}
+#Random pattern 71 for SPP scheme
+'Random pattern 71 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 171 ;
+	}
+#Random pattern 72 for SPP scheme
+'Random pattern 72 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 172 ;
+	}
+#Random pattern 73 for SPP scheme
+'Random pattern 73 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 173 ;
+	}
+#Random pattern 74 for SPP scheme
+'Random pattern 74 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 174 ;
+	}
+#Random pattern 75 for SPP scheme
+'Random pattern 75 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 175 ;
+	}
+#Random pattern 76 for SPP scheme
+'Random pattern 76 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 176 ;
+	}
+#Random pattern 77 for SPP scheme
+'Random pattern 77 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 177 ;
+	}
+#Random pattern 78 for SPP scheme
+'Random pattern 78 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 178 ;
+	}
+#Random pattern 79 for SPP scheme
+'Random pattern 79 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 179 ;
+	}
+#Random pattern 80 for SPP scheme
+'Random pattern 80 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 180 ;
+	}
+#Random pattern 81 for SPP scheme
+'Random pattern 81 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 181 ;
+	}
+#Random pattern 82 for SPP scheme
+'Random pattern 82 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 182 ;
+	}
+#Random pattern 83 for SPP scheme
+'Random pattern 83 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 183 ;
+	}
+#Random pattern 84 for SPP scheme
+'Random pattern 84 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 184 ;
+	}
+#Random pattern 85 for SPP scheme
+'Random pattern 85 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 185 ;
+	}
+#Random pattern 86 for SPP scheme
+'Random pattern 86 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 186 ;
+	}
+#Random pattern 87 for SPP scheme
+'Random pattern 87 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 187 ;
+	}
+#Random pattern 88 for SPP scheme
+'Random pattern 88 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 188 ;
+	}
+#Random pattern 89 for SPP scheme
+'Random pattern 89 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 189 ;
+	}
+#Random pattern 90 for SPP scheme
+'Random pattern 90 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 190 ;
+	}
+#Random pattern 91 for SPP scheme
+'Random pattern 91 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 191 ;
+	}
+#Random pattern 92 for SPP scheme
+'Random pattern 92 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 192 ;
+	}
+#Random pattern 93 for SPP scheme
+'Random pattern 93 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 193 ;
+	}
+#Random pattern 94 for SPP scheme
+'Random pattern 94 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 194 ;
+	}
+#Random pattern 95 for SPP scheme
+'Random pattern 95 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 195 ;
+	}
+#Random pattern 96 for SPP scheme
+'Random pattern 96 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 196 ;
+	}
+#Random pattern 97 for SPP scheme
+'Random pattern 97 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 197 ;
+	}
+#Random pattern 98 for SPP scheme
+'Random pattern 98 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 198 ;
+	}
+#Random pattern 99 for SPP scheme
+'Random pattern 99 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 199 ;
+	}
+#Random pattern 100 for SPP scheme
+'Random pattern 100 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 200 ;
+	}
+#Random pattern 101 for SPP scheme
+'Random pattern 101 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 201 ;
+	}
+#Random pattern 102 for SPP scheme
+'Random pattern 102 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 202 ;
+	}
+#Random pattern 103 for SPP scheme
+'Random pattern 103 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 203 ;
+	}
+#Random pattern 104 for SPP scheme
+'Random pattern 104 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 204 ;
+	}
+#Random pattern 105 for SPP scheme
+'Random pattern 105 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 205 ;
+	}
+#Random pattern 106 for SPP scheme
+'Random pattern 106 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 206 ;
+	}
+#Random pattern 107 for SPP scheme
+'Random pattern 107 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 207 ;
+	}
+#Random pattern 108 for SPP scheme
+'Random pattern 108 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 208 ;
+	}
+#Random pattern 109 for SPP scheme
+'Random pattern 109 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 209 ;
+	}
+#Random pattern 110 for SPP scheme
+'Random pattern 110 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 210 ;
+	}
+#Random pattern 111 for SPP scheme
+'Random pattern 111 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 211 ;
+	}
+#Random pattern 112 for SPP scheme
+'Random pattern 112 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 212 ;
+	}
+#Random pattern 113 for SPP scheme
+'Random pattern 113 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 213 ;
+	}
+#Random pattern 114 for SPP scheme
+'Random pattern 114 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 214 ;
+	}
+#Random pattern 115 for SPP scheme
+'Random pattern 115 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 215 ;
+	}
+#Random pattern 116 for SPP scheme
+'Random pattern 116 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 216 ;
+	}
+#Random pattern 117 for SPP scheme
+'Random pattern 117 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 217 ;
+	}
+#Random pattern 118 for SPP scheme
+'Random pattern 118 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 218 ;
+	}
+#Random pattern 119 for SPP scheme
+'Random pattern 119 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 219 ;
+	}
+#Random pattern 120 for SPP scheme
+'Random pattern 120 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 220 ;
+	}
+#Random pattern 121 for SPP scheme
+'Random pattern 121 for SPP scheme' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 221 ;
+	}
 #Cosine of solar zenith angle
 'Cosine of solar zenith angle' = {
 	 table2Version = 214 ;

definitions/grib1/localConcepts/ecmf/paramId.def

@@ -1294,12 +1294,12 @@
 	 table2Version = 190 ;
 	 indicatorOfParameter = 168 ;
 	}
-#Surface short-wave radiation downwards
+#Surface short-wave (solar) radiation downwards
 '169' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 169 ;
 	}
-#Surface short-wave radiation downwards
+#Surface short-wave (solar) radiation downwards
 '169' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 169 ;
@@ -1379,82 +1379,82 @@
 	 table2Version = 190 ;
 	 indicatorOfParameter = 174 ;
 	}
-#Surface long-wave radiation downwards
+#Surface long-wave (thermal) radiation downwards
 '175' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 175 ;
 	}
-#Surface long-wave radiation downwards
+#Surface long-wave (thermal) radiation downwards
 '175' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 175 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 '176' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 '176' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 '176' = {
 	 table2Version = 170 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 '176' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 '177' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 '177' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 '177' = {
 	 table2Version = 170 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 '177' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 '178' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 '178' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 '178' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 '179' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 179 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 '179' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 179 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 '179' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 179 ;
@@ -1749,12 +1749,12 @@
 	 table2Version = 128 ;
 	 indicatorOfParameter = 209 ;
 	}
-#Surface net short-wave radiation, clear sky
+#Surface net short-wave (solar) radiation, clear sky
 '210' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 210 ;
 	}
-#Surface net long-wave radiation, clear sky
+#Surface net long-wave (thermal) radiation, clear sky
 '211' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 211 ;
@@ -5879,6 +5879,361 @@
 	 table2Version = 213 ;
 	 indicatorOfParameter = 150 ;
 	}
+#Random pattern 51 for SPP scheme
+'213151' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 151 ;
+	}
+#Random pattern 52 for SPP scheme
+'213152' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 152 ;
+	}
+#Random pattern 53 for SPP scheme
+'213153' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 153 ;
+	}
+#Random pattern 54 for SPP scheme
+'213154' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 154 ;
+	}
+#Random pattern 55 for SPP scheme
+'213155' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 155 ;
+	}
+#Random pattern 56 for SPP scheme
+'213156' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 156 ;
+	}
+#Random pattern 57 for SPP scheme
+'213157' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 157 ;
+	}
+#Random pattern 58 for SPP scheme
+'213158' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 158 ;
+	}
+#Random pattern 59 for SPP scheme
+'213159' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 159 ;
+	}
+#Random pattern 60 for SPP scheme
+'213160' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 160 ;
+	}
+#Random pattern 61 for SPP scheme
+'213161' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 161 ;
+	}
+#Random pattern 62 for SPP scheme
+'213162' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 162 ;
+	}
+#Random pattern 63 for SPP scheme
+'213163' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 163 ;
+	}
+#Random pattern 64 for SPP scheme
+'213164' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 164 ;
+	}
+#Random pattern 65 for SPP scheme
+'213165' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 165 ;
+	}
+#Random pattern 66 for SPP scheme
+'213166' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 166 ;
+	}
+#Random pattern 67 for SPP scheme
+'213167' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 167 ;
+	}
+#Random pattern 68 for SPP scheme
+'213168' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 168 ;
+	}
+#Random pattern 69 for SPP scheme
+'213169' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 169 ;
+	}
+#Random pattern 70 for SPP scheme
+'213170' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 170 ;
+	}
+#Random pattern 71 for SPP scheme
+'213171' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 171 ;
+	}
+#Random pattern 72 for SPP scheme
+'213172' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 172 ;
+	}
+#Random pattern 73 for SPP scheme
+'213173' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 173 ;
+	}
+#Random pattern 74 for SPP scheme
+'213174' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 174 ;
+	}
+#Random pattern 75 for SPP scheme
+'213175' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 175 ;
+	}
+#Random pattern 76 for SPP scheme
+'213176' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 176 ;
+	}
+#Random pattern 77 for SPP scheme
+'213177' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 177 ;
+	}
+#Random pattern 78 for SPP scheme
+'213178' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 178 ;
+	}
+#Random pattern 79 for SPP scheme
+'213179' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 179 ;
+	}
+#Random pattern 80 for SPP scheme
+'213180' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 180 ;
+	}
+#Random pattern 81 for SPP scheme
+'213181' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 181 ;
+	}
+#Random pattern 82 for SPP scheme
+'213182' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 182 ;
+	}
+#Random pattern 83 for SPP scheme
+'213183' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 183 ;
+	}
+#Random pattern 84 for SPP scheme
+'213184' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 184 ;
+	}
+#Random pattern 85 for SPP scheme
+'213185' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 185 ;
+	}
+#Random pattern 86 for SPP scheme
+'213186' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 186 ;
+	}
+#Random pattern 87 for SPP scheme
+'213187' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 187 ;
+	}
+#Random pattern 88 for SPP scheme
+'213188' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 188 ;
+	}
+#Random pattern 89 for SPP scheme
+'213189' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 189 ;
+	}
+#Random pattern 90 for SPP scheme
+'213190' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 190 ;
+	}
+#Random pattern 91 for SPP scheme
+'213191' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 191 ;
+	}
+#Random pattern 92 for SPP scheme
+'213192' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 192 ;
+	}
+#Random pattern 93 for SPP scheme
+'213193' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 193 ;
+	}
+#Random pattern 94 for SPP scheme
+'213194' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 194 ;
+	}
+#Random pattern 95 for SPP scheme
+'213195' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 195 ;
+	}
+#Random pattern 96 for SPP scheme
+'213196' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 196 ;
+	}
+#Random pattern 97 for SPP scheme
+'213197' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 197 ;
+	}
+#Random pattern 98 for SPP scheme
+'213198' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 198 ;
+	}
+#Random pattern 99 for SPP scheme
+'213199' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 199 ;
+	}
+#Random pattern 100 for SPP scheme
+'213200' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 200 ;
+	}
+#Random pattern 101 for SPP scheme
+'213201' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 201 ;
+	}
+#Random pattern 102 for SPP scheme
+'213202' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 202 ;
+	}
+#Random pattern 103 for SPP scheme
+'213203' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 203 ;
+	}
+#Random pattern 104 for SPP scheme
+'213204' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 204 ;
+	}
+#Random pattern 105 for SPP scheme
+'213205' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 205 ;
+	}
+#Random pattern 106 for SPP scheme
+'213206' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 206 ;
+	}
+#Random pattern 107 for SPP scheme
+'213207' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 207 ;
+	}
+#Random pattern 108 for SPP scheme
+'213208' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 208 ;
+	}
+#Random pattern 109 for SPP scheme
+'213209' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 209 ;
+	}
+#Random pattern 110 for SPP scheme
+'213210' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 210 ;
+	}
+#Random pattern 111 for SPP scheme
+'213211' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 211 ;
+	}
+#Random pattern 112 for SPP scheme
+'213212' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 212 ;
+	}
+#Random pattern 113 for SPP scheme
+'213213' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 213 ;
+	}
+#Random pattern 114 for SPP scheme
+'213214' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 214 ;
+	}
+#Random pattern 115 for SPP scheme
+'213215' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 215 ;
+	}
+#Random pattern 116 for SPP scheme
+'213216' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 216 ;
+	}
+#Random pattern 117 for SPP scheme
+'213217' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 217 ;
+	}
+#Random pattern 118 for SPP scheme
+'213218' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 218 ;
+	}
+#Random pattern 119 for SPP scheme
+'213219' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 219 ;
+	}
+#Random pattern 120 for SPP scheme
+'213220' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 220 ;
+	}
+#Random pattern 121 for SPP scheme
+'213221' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 221 ;
+	}
 #Cosine of solar zenith angle
 '214001' = {
 	 table2Version = 214 ;

definitions/grib1/localConcepts/ecmf/shortName.def

@@ -1294,12 +1294,12 @@
 	 table2Version = 190 ;
 	 indicatorOfParameter = 168 ;
 	}
-#Surface short-wave radiation downwards
+#Surface short-wave (solar) radiation downwards
 'ssrd' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 169 ;
 	}
-#Surface short-wave radiation downwards
+#Surface short-wave (solar) radiation downwards
 'ssrd' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 169 ;
@@ -1379,82 +1379,82 @@
 	 table2Version = 190 ;
 	 indicatorOfParameter = 174 ;
 	}
-#Surface long-wave radiation downwards
+#Surface long-wave (thermal) radiation downwards
 'strd' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 175 ;
 	}
-#Surface long-wave radiation downwards
+#Surface long-wave (thermal) radiation downwards
 'strd' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 175 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'ssr' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'ssr' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'ssr' = {
 	 table2Version = 170 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'ssr' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'str' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'str' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'str' = {
 	 table2Version = 170 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'str' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 'tsr' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 'tsr' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 'tsr' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 'ttr' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 179 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 'ttr' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 179 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 'ttr' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 179 ;
@@ -1749,12 +1749,12 @@
 	 table2Version = 128 ;
 	 indicatorOfParameter = 209 ;
 	}
-#Surface net short-wave radiation, clear sky
+#Surface net short-wave (solar) radiation, clear sky
 'ssrc' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 210 ;
 	}
-#Surface net long-wave radiation, clear sky
+#Surface net long-wave (thermal) radiation, clear sky
 'strc' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 211 ;
@@ -5879,6 +5879,361 @@
 	 table2Version = 213 ;
 	 indicatorOfParameter = 150 ;
 	}
+#Random pattern 51 for SPP scheme
+'spp51' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 151 ;
+	}
+#Random pattern 52 for SPP scheme
+'spp52' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 152 ;
+	}
+#Random pattern 53 for SPP scheme
+'spp53' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 153 ;
+	}
+#Random pattern 54 for SPP scheme
+'spp54' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 154 ;
+	}
+#Random pattern 55 for SPP scheme
+'spp55' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 155 ;
+	}
+#Random pattern 56 for SPP scheme
+'spp56' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 156 ;
+	}
+#Random pattern 57 for SPP scheme
+'spp57' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 157 ;
+	}
+#Random pattern 58 for SPP scheme
+'spp58' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 158 ;
+	}
+#Random pattern 59 for SPP scheme
+'spp59' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 159 ;
+	}
+#Random pattern 60 for SPP scheme
+'spp60' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 160 ;
+	}
+#Random pattern 61 for SPP scheme
+'spp61' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 161 ;
+	}
+#Random pattern 62 for SPP scheme
+'spp62' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 162 ;
+	}
+#Random pattern 63 for SPP scheme
+'spp63' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 163 ;
+	}
+#Random pattern 64 for SPP scheme
+'spp64' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 164 ;
+	}
+#Random pattern 65 for SPP scheme
+'spp65' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 165 ;
+	}
+#Random pattern 66 for SPP scheme
+'spp66' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 166 ;
+	}
+#Random pattern 67 for SPP scheme
+'spp67' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 167 ;
+	}
+#Random pattern 68 for SPP scheme
+'spp68' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 168 ;
+	}
+#Random pattern 69 for SPP scheme
+'spp69' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 169 ;
+	}
+#Random pattern 70 for SPP scheme
+'spp70' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 170 ;
+	}
+#Random pattern 71 for SPP scheme
+'spp71' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 171 ;
+	}
+#Random pattern 72 for SPP scheme
+'spp72' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 172 ;
+	}
+#Random pattern 73 for SPP scheme
+'spp73' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 173 ;
+	}
+#Random pattern 74 for SPP scheme
+'spp74' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 174 ;
+	}
+#Random pattern 75 for SPP scheme
+'spp75' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 175 ;
+	}
+#Random pattern 76 for SPP scheme
+'spp76' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 176 ;
+	}
+#Random pattern 77 for SPP scheme
+'spp77' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 177 ;
+	}
+#Random pattern 78 for SPP scheme
+'spp78' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 178 ;
+	}
+#Random pattern 79 for SPP scheme
+'spp79' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 179 ;
+	}
+#Random pattern 80 for SPP scheme
+'spp80' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 180 ;
+	}
+#Random pattern 81 for SPP scheme
+'spp81' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 181 ;
+	}
+#Random pattern 82 for SPP scheme
+'spp82' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 182 ;
+	}
+#Random pattern 83 for SPP scheme
+'spp83' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 183 ;
+	}
+#Random pattern 84 for SPP scheme
+'spp84' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 184 ;
+	}
+#Random pattern 85 for SPP scheme
+'spp85' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 185 ;
+	}
+#Random pattern 86 for SPP scheme
+'spp86' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 186 ;
+	}
+#Random pattern 87 for SPP scheme
+'spp87' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 187 ;
+	}
+#Random pattern 88 for SPP scheme
+'spp88' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 188 ;
+	}
+#Random pattern 89 for SPP scheme
+'spp89' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 189 ;
+	}
+#Random pattern 90 for SPP scheme
+'spp90' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 190 ;
+	}
+#Random pattern 91 for SPP scheme
+'spp91' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 191 ;
+	}
+#Random pattern 92 for SPP scheme
+'spp92' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 192 ;
+	}
+#Random pattern 93 for SPP scheme
+'spp93' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 193 ;
+	}
+#Random pattern 94 for SPP scheme
+'spp94' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 194 ;
+	}
+#Random pattern 95 for SPP scheme
+'spp95' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 195 ;
+	}
+#Random pattern 96 for SPP scheme
+'spp96' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 196 ;
+	}
+#Random pattern 97 for SPP scheme
+'spp97' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 197 ;
+	}
+#Random pattern 98 for SPP scheme
+'spp98' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 198 ;
+	}
+#Random pattern 99 for SPP scheme
+'spp99' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 199 ;
+	}
+#Random pattern 100 for SPP scheme
+'spp100' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 200 ;
+	}
+#Random pattern 101 for SPP scheme
+'spp101' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 201 ;
+	}
+#Random pattern 102 for SPP scheme
+'spp102' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 202 ;
+	}
+#Random pattern 103 for SPP scheme
+'spp103' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 203 ;
+	}
+#Random pattern 104 for SPP scheme
+'spp104' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 204 ;
+	}
+#Random pattern 105 for SPP scheme
+'spp105' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 205 ;
+	}
+#Random pattern 106 for SPP scheme
+'spp106' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 206 ;
+	}
+#Random pattern 107 for SPP scheme
+'spp107' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 207 ;
+	}
+#Random pattern 108 for SPP scheme
+'spp108' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 208 ;
+	}
+#Random pattern 109 for SPP scheme
+'spp109' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 209 ;
+	}
+#Random pattern 110 for SPP scheme
+'spp110' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 210 ;
+	}
+#Random pattern 111 for SPP scheme
+'spp111' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 211 ;
+	}
+#Random pattern 112 for SPP scheme
+'spp112' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 212 ;
+	}
+#Random pattern 113 for SPP scheme
+'spp113' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 213 ;
+	}
+#Random pattern 114 for SPP scheme
+'spp114' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 214 ;
+	}
+#Random pattern 115 for SPP scheme
+'spp115' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 215 ;
+	}
+#Random pattern 116 for SPP scheme
+'spp116' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 216 ;
+	}
+#Random pattern 117 for SPP scheme
+'spp117' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 217 ;
+	}
+#Random pattern 118 for SPP scheme
+'spp118' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 218 ;
+	}
+#Random pattern 119 for SPP scheme
+'spp119' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 219 ;
+	}
+#Random pattern 120 for SPP scheme
+'spp120' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 220 ;
+	}
+#Random pattern 121 for SPP scheme
+'spp121' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 221 ;
+	}
 #Cosine of solar zenith angle
 'uvcossza' = {
 	 table2Version = 214 ;

definitions/grib1/localConcepts/ecmf/units.def

@@ -1294,12 +1294,12 @@
 	 table2Version = 190 ;
 	 indicatorOfParameter = 168 ;
 	}
-#Surface short-wave radiation downwards
+#Surface short-wave (solar) radiation downwards
 'J m**-2' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 169 ;
 	}
-#Surface short-wave radiation downwards
+#Surface short-wave (solar) radiation downwards
 'J m**-2' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 169 ;
@@ -1379,82 +1379,82 @@
 	 table2Version = 190 ;
 	 indicatorOfParameter = 174 ;
 	}
-#Surface long-wave radiation downwards
+#Surface long-wave (thermal) radiation downwards
 'J m**-2' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 175 ;
 	}
-#Surface long-wave radiation downwards
+#Surface long-wave (thermal) radiation downwards
 'J m**-2' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 175 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'J m**-2' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'J m**-2' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'J m**-2' = {
 	 table2Version = 170 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'J m**-2' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'J m**-2' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'J m**-2' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'J m**-2' = {
 	 table2Version = 170 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'J m**-2' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 'J m**-2' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 'J m**-2' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 'J m**-2' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 'J m**-2' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 179 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 'J m**-2' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 179 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 'J m**-2' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 179 ;
@@ -1749,12 +1749,12 @@
 	 table2Version = 128 ;
 	 indicatorOfParameter = 209 ;
 	}
-#Surface net short-wave radiation, clear sky
+#Surface net short-wave (solar) radiation, clear sky
 'J m**-2' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 210 ;
 	}
-#Surface net long-wave radiation, clear sky
+#Surface net long-wave (thermal) radiation, clear sky
 'J m**-2' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 211 ;
@@ -5879,6 +5879,361 @@
 	 table2Version = 213 ;
 	 indicatorOfParameter = 150 ;
 	}
+#Random pattern 51 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 151 ;
+	}
+#Random pattern 52 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 152 ;
+	}
+#Random pattern 53 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 153 ;
+	}
+#Random pattern 54 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 154 ;
+	}
+#Random pattern 55 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 155 ;
+	}
+#Random pattern 56 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 156 ;
+	}
+#Random pattern 57 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 157 ;
+	}
+#Random pattern 58 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 158 ;
+	}
+#Random pattern 59 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 159 ;
+	}
+#Random pattern 60 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 160 ;
+	}
+#Random pattern 61 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 161 ;
+	}
+#Random pattern 62 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 162 ;
+	}
+#Random pattern 63 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 163 ;
+	}
+#Random pattern 64 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 164 ;
+	}
+#Random pattern 65 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 165 ;
+	}
+#Random pattern 66 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 166 ;
+	}
+#Random pattern 67 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 167 ;
+	}
+#Random pattern 68 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 168 ;
+	}
+#Random pattern 69 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 169 ;
+	}
+#Random pattern 70 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 170 ;
+	}
+#Random pattern 71 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 171 ;
+	}
+#Random pattern 72 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 172 ;
+	}
+#Random pattern 73 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 173 ;
+	}
+#Random pattern 74 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 174 ;
+	}
+#Random pattern 75 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 175 ;
+	}
+#Random pattern 76 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 176 ;
+	}
+#Random pattern 77 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 177 ;
+	}
+#Random pattern 78 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 178 ;
+	}
+#Random pattern 79 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 179 ;
+	}
+#Random pattern 80 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 180 ;
+	}
+#Random pattern 81 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 181 ;
+	}
+#Random pattern 82 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 182 ;
+	}
+#Random pattern 83 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 183 ;
+	}
+#Random pattern 84 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 184 ;
+	}
+#Random pattern 85 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 185 ;
+	}
+#Random pattern 86 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 186 ;
+	}
+#Random pattern 87 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 187 ;
+	}
+#Random pattern 88 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 188 ;
+	}
+#Random pattern 89 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 189 ;
+	}
+#Random pattern 90 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 190 ;
+	}
+#Random pattern 91 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 191 ;
+	}
+#Random pattern 92 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 192 ;
+	}
+#Random pattern 93 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 193 ;
+	}
+#Random pattern 94 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 194 ;
+	}
+#Random pattern 95 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 195 ;
+	}
+#Random pattern 96 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 196 ;
+	}
+#Random pattern 97 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 197 ;
+	}
+#Random pattern 98 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 198 ;
+	}
+#Random pattern 99 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 199 ;
+	}
+#Random pattern 100 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 200 ;
+	}
+#Random pattern 101 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 201 ;
+	}
+#Random pattern 102 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 202 ;
+	}
+#Random pattern 103 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 203 ;
+	}
+#Random pattern 104 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 204 ;
+	}
+#Random pattern 105 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 205 ;
+	}
+#Random pattern 106 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 206 ;
+	}
+#Random pattern 107 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 207 ;
+	}
+#Random pattern 108 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 208 ;
+	}
+#Random pattern 109 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 209 ;
+	}
+#Random pattern 110 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 210 ;
+	}
+#Random pattern 111 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 211 ;
+	}
+#Random pattern 112 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 212 ;
+	}
+#Random pattern 113 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 213 ;
+	}
+#Random pattern 114 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 214 ;
+	}
+#Random pattern 115 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 215 ;
+	}
+#Random pattern 116 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 216 ;
+	}
+#Random pattern 117 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 217 ;
+	}
+#Random pattern 118 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 218 ;
+	}
+#Random pattern 119 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 219 ;
+	}
+#Random pattern 120 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 220 ;
+	}
+#Random pattern 121 for SPP scheme
+'dimensionless' = {
+	 table2Version = 213 ;
+	 indicatorOfParameter = 221 ;
+	}
 #Cosine of solar zenith angle
 '~' = {
 	 table2Version = 214 ;

definitions/grib2/cfName.def

@@ -4,14 +4,24 @@
 	 discipline = 10 ;
 	 parameterCategory = 2 ;
 	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
 	}
 #Total column vertically-integrated water vapour
 'lwe_thickness_of_atmosphere_mass_content_of_water_vapor' = {
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
 	 parameterNumber = 64 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
 	}
-#Surface short-wave radiation downwards
+#Boundary layer dissipation
+'kinetic_energy_dissipation_in_atmosphere_boundary_layer' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 20 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Surface short-wave (solar) radiation downwards
 'surface_downwelling_shortwave_flux_in_air' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -19,7 +29,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 'toa_net_upward_shortwave_flux' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -32,12 +42,16 @@
 	 discipline = 0 ;
 	 parameterCategory = 2 ;
 	 parameterNumber = 38 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Northward turbulent surface stress
 'surface_downward_northward_stress' = {
 	 discipline = 0 ;
 	 parameterCategory = 2 ;
 	 parameterNumber = 37 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Ozone mass mixing ratio
 'mass_fraction_of_ozone_in_air' = {
@@ -45,7 +59,7 @@
 	 parameterCategory = 14 ;
 	 parameterNumber = 1 ;
 	}
-#Surface net short-wave radiation, clear sky
+#Surface net short-wave (solar) radiation, clear sky
 'surface_net_downward_shortwave_flux_assuming_clear_sky' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -53,7 +67,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface net long-wave radiation, clear sky
+#Surface net long-wave (thermal) radiation, clear sky
 'surface_net_downward_longwave_flux_assuming_clear_sky' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
@@ -271,12 +285,6 @@
 	 parameterCategory = 2 ;
 	 parameterNumber = 12 ;
 	}
-#Boundary layer dissipation
-'kinetic_energy_dissipation_in_atmosphere_boundary_layer' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 20 ;
-	}
 #Surface sensible heat flux
 'surface_upward_sensible_heat_flux' = {
 	 discipline = 0 ;
@@ -331,7 +339,7 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 1 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'surface_net_downward_shortwave_flux' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -339,7 +347,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'surface_net_upward_longwave_flux' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
@@ -347,7 +355,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 'toa_outgoing_longwave_flux' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;

definitions/grib2/cfVarName.def

@@ -136,6 +136,7 @@
 	 discipline = 10 ;
 	 parameterCategory = 2 ;
 	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
 	}
 #Snow density
 'rsn' = {
@@ -165,6 +166,30 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
+#Large-scale precipitation fraction
+'lspf' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 36 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Downward UV radiation at the surface
+'uvb' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 12 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Photosynthetically active radiation at the surface
+'par' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 10 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
 #Specific rain water content
 'crwc' = {
 	 discipline = 0 ;
@@ -204,8 +229,23 @@
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
 	 parameterNumber = 64 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
 	}
-#Surface short-wave radiation downwards
+#Boundary layer dissipation
+'bld' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 20 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Boundary layer height
+'blh' = {
+	 discipline = 0 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 18 ;
+	}
+#Surface short-wave (solar) radiation downwards
 'ssrd' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -213,15 +253,15 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface long-wave radiation downwards
+#Surface long-wave (thermal) radiation downwards
 'strd' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
 	 parameterNumber = 3 ;
-	 typeOfStatisticalProcessing = 1 ;
 	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 'tsr' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -234,12 +274,39 @@
 	 discipline = 0 ;
 	 parameterCategory = 2 ;
 	 parameterNumber = 38 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Northward turbulent surface stress
 'nsss' = {
 	 discipline = 0 ;
 	 parameterCategory = 2 ;
 	 parameterNumber = 37 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Eastward gravity wave surface stress
+'lgws' = {
+	 discipline = 0 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 16 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Northward gravity wave surface stress
+'mgws' = {
+	 discipline = 0 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 17 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Gravity wave dissipation
+'gwd' = {
+	 discipline = 0 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 23 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Ozone mass mixing ratio
 'o3' = {
@@ -247,7 +314,23 @@
 	 parameterCategory = 14 ;
 	 parameterNumber = 1 ;
 	}
-#Surface net short-wave radiation, clear sky
+#Top net solar radiation, clear sky
+'tsrc' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 11 ;
+	 typeOfFirstFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Top net thermal radiation, clear sky
+'ttrc' = {
+	 discipline = 0 ;
+	 parameterCategory = 5 ;
+	 parameterNumber = 6 ;
+	 typeOfFirstFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Surface net short-wave (solar) radiation, clear sky
 'ssrc' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -255,7 +338,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface net long-wave radiation, clear sky
+#Surface net long-wave (thermal) radiation, clear sky
 'strc' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
@@ -263,6 +346,42 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
+#TOA incident solar radiation
+'tisr' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 7 ;
+	 typeOfFirstFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Instantaneous eastward turbulent surface stress
+'iews' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 38 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
+#Instantaneous northward turbulent surface stress
+'inss' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 37 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
+#Instantaneous surface sensible heat flux
+'ishf' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 11 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
+#Instantaneous moisture flux
+'ie' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 79 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
 #Temperature of snow layer
 'tsn' = {
 	 discipline = 2 ;
@@ -324,48 +443,48 @@
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
 	 parameterNumber = 52 ;
+	 typeOfFirstFixedSurface = 1 ;
 	 productDefinitionTemplateNumber = 9 ;
 	 typeOfStatisticalProcessing = 1 ;
 	 scaledValueOfLowerLimit = 25 ;
-	 probabilityType = 3 ;
 	 scaleFactorOfLowerLimit = 0 ;
-	 typeOfFirstFixedSurface = 1 ;
+	 probabilityType = 3 ;
 	}
 #Total precipitation of at least 50 mm
 'tpg50' = {
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
 	 parameterNumber = 52 ;
-	 probabilityType = 3 ;
-	 scaleFactorOfLowerLimit = 0 ;
 	 typeOfFirstFixedSurface = 1 ;
 	 productDefinitionTemplateNumber = 9 ;
 	 typeOfStatisticalProcessing = 1 ;
 	 scaledValueOfLowerLimit = 50 ;
+	 scaleFactorOfLowerLimit = 0 ;
+	 probabilityType = 3 ;
 	}
 #10 metre wind gust of at least 10 m/s
 'fgg1010' = {
 	 discipline = 0 ;
 	 parameterCategory = 2 ;
 	 parameterNumber = 22 ;
-	 scaleFactorOfLowerLimit = 0 ;
+	 typeOfFirstFixedSurface = 103 ;
 	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
 	 productDefinitionTemplateNumber = 9 ;
 	 typeOfStatisticalProcessing = 2 ;
 	 scaledValueOfLowerLimit = 10 ;
-	 typeOfFirstFixedSurface = 103 ;
+	 scaleFactorOfLowerLimit = 0 ;
 	 probabilityType = 3 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
 	}
 #Probability of temperature standardized anomaly greater than 1 standard deviation
 'ptsa_gt_1stdev' = {
 	 discipline = 0 ;
 	 parameterCategory = 0 ;
 	 parameterNumber = 0 ;
-	 scaleFactorOfLowerLimit = 0 ;
 	 productDefinitionTemplateNumber = 9 ;
 	 typeOfStatisticalProcessing = 10 ;
 	 scaledValueOfLowerLimit = 1 ;
+	 scaleFactorOfLowerLimit = 0 ;
 	 probabilityType = 3 ;
 	}
 #Probability of temperature standardized anomaly greater than 1.5 standard deviation
@@ -373,11 +492,11 @@
 	 discipline = 0 ;
 	 parameterCategory = 0 ;
 	 parameterNumber = 0 ;
+	 productDefinitionTemplateNumber = 9 ;
 	 typeOfStatisticalProcessing = 10 ;
 	 scaledValueOfLowerLimit = 15 ;
-	 probabilityType = 3 ;
 	 scaleFactorOfLowerLimit = 1 ;
-	 productDefinitionTemplateNumber = 9 ;
+	 probabilityType = 3 ;
 	}
 #Probability of temperature standardized anomaly greater than 2 standard deviation
 'ptsa_gt_2stdev' = {
@@ -387,18 +506,18 @@
 	 productDefinitionTemplateNumber = 9 ;
 	 typeOfStatisticalProcessing = 10 ;
 	 scaledValueOfLowerLimit = 2 ;
-	 probabilityType = 3 ;
 	 scaleFactorOfLowerLimit = 0 ;
+	 probabilityType = 3 ;
 	}
 #Probability of temperature standardized anomaly less than -1 standard deviation
 'ptsa_lt_1stdev' = {
 	 discipline = 0 ;
 	 parameterCategory = 0 ;
 	 parameterNumber = 0 ;
-	 scaleFactorOfLowerLimit = 0 ;
 	 productDefinitionTemplateNumber = 9 ;
 	 typeOfStatisticalProcessing = 10 ;
 	 scaledValueOfLowerLimit = -1 ;
+	 scaleFactorOfLowerLimit = 0 ;
 	 probabilityType = 0 ;
 	}
 #Probability of temperature standardized anomaly less than -1.5 standard deviation
@@ -406,22 +525,22 @@
 	 discipline = 0 ;
 	 parameterCategory = 0 ;
 	 parameterNumber = 0 ;
-	 probabilityType = 0 ;
-	 scaleFactorOfLowerLimit = 1 ;
 	 productDefinitionTemplateNumber = 9 ;
 	 typeOfStatisticalProcessing = 10 ;
 	 scaledValueOfLowerLimit = -15 ;
+	 scaleFactorOfLowerLimit = 1 ;
+	 probabilityType = 0 ;
 	}
 #Probability of temperature standardized anomaly less than -2 standard deviation
 'ptsa_lt_2stdev' = {
 	 discipline = 0 ;
 	 parameterCategory = 0 ;
 	 parameterNumber = 0 ;
+	 productDefinitionTemplateNumber = 9 ;
 	 typeOfStatisticalProcessing = 10 ;
 	 scaledValueOfLowerLimit = -2 ;
-	 probabilityType = 0 ;
 	 scaleFactorOfLowerLimit = 0 ;
-	 productDefinitionTemplateNumber = 9 ;
+	 probabilityType = 0 ;
 	}
 #Mean sea water temperature in the upper 300 m
 'mswt300m' = {
@@ -430,8 +549,8 @@
 	 parameterNumber = 15 ;
 	 typeOfFirstFixedSurface = 160 ;
 	 typeOfSecondFixedSurface = 160 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
 	 scaledValueOfFirstFixedSurface = 0 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
 	 scaledValueOfSecondFixedSurface = 300 ;
 	 scaleFactorOfSecondFixedSurface = 0 ;
 	}
@@ -506,12 +625,12 @@
 	 discipline = 0 ;
 	 parameterCategory = 20 ;
 	 parameterNumber = 102 ;
-	 is_aerosol_optical = 1 ;
-	 typeOfWavelengthInterval = 11 ;
 	 scaleFactorOfFirstWavelength = 8 ;
-	 scaledValueOfFirstWavelength = 55 ;
 	 typeOfSizeInterval = 255 ;
 	 aerosolType = 62004 ;
+	 scaledValueOfFirstWavelength = 55 ;
+	 typeOfWavelengthInterval = 11 ;
+	 is_aerosol_optical = 1 ;
 	}
 #Ammonium aerosol optical depth at 550 nm
 'amaod550' = {
@@ -519,11 +638,11 @@
 	 parameterCategory = 20 ;
 	 parameterNumber = 102 ;
 	 scaleFactorOfFirstWavelength = 8 ;
-	 scaledValueOfFirstWavelength = 55 ;
 	 typeOfSizeInterval = 255 ;
 	 aerosolType = 62003 ;
-	 is_aerosol_optical = 1 ;
+	 scaledValueOfFirstWavelength = 55 ;
 	 typeOfWavelengthInterval = 11 ;
+	 is_aerosol_optical = 1 ;
 	}
 #Biogenic secondary organic aerosol mass mixing ratio
 'aermr19' = {
@@ -556,8 +675,8 @@
 	 discipline = 0 ;
 	 parameterCategory = 20 ;
 	 parameterNumber = 2 ;
-	 typeOfGeneratingProcess = 20 ;
 	 aerosolType = 62003 ;
+	 typeOfGeneratingProcess = 20 ;
 	 is_aerosol = 1 ;
 	}
 #Biogenic secondary organic aerosol mass mixing ratio increment
@@ -566,17 +685,17 @@
 	 parameterCategory = 20 ;
 	 parameterNumber = 2 ;
 	 aerosolType = 62032 ;
-	 is_aerosol = 1 ;
 	 typeOfGeneratingProcess = 20 ;
+	 is_aerosol = 1 ;
 	}
 #Anthropogenic secondary organic aerosol mass mixing ratio increment
 'aermr20diff' = {
 	 discipline = 0 ;
 	 parameterCategory = 20 ;
 	 parameterNumber = 2 ;
-	 is_aerosol = 1 ;
-	 typeOfGeneratingProcess = 20 ;
 	 aerosolType = 62033 ;
+	 typeOfGeneratingProcess = 20 ;
+	 is_aerosol = 1 ;
 	}
 #Dry deposition of ammonium aerosol
 'aerddpam' = {
@@ -607,26 +726,26 @@
 	 discipline = 0 ;
 	 parameterCategory = 20 ;
 	 parameterNumber = 10 ;
-	 is_aerosol = 1 ;
 	 aerosolType = 62003 ;
+	 is_aerosol = 1 ;
 	}
 #Vertically integrated mass of ammonium aerosol
 'aermssam' = {
 	 discipline = 0 ;
 	 parameterCategory = 20 ;
 	 parameterNumber = 1 ;
-	 is_aerosol = 1 ;
-	 typeOfSecondFixedSurface = 8 ;
 	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
 	 aerosolType = 62003 ;
+	 is_aerosol = 1 ;
 	}
 #Dry deposition of biogenic secondary organic aerosol
 'aerddpsoab' = {
 	 discipline = 0 ;
 	 parameterCategory = 20 ;
 	 parameterNumber = 12 ;
-	 is_aerosol = 1 ;
 	 aerosolType = 62032 ;
+	 is_aerosol = 1 ;
 	}
 #Sedimentation of biogenic secondary organic aerosol
 'aersdmsoab' = {
@@ -657,8 +776,8 @@
 	 discipline = 0 ;
 	 parameterCategory = 20 ;
 	 parameterNumber = 1 ;
-	 is_aerosol = 1 ;
 	 aerosolType = 62032 ;
+	 is_aerosol = 1 ;
 	}
 #Dry deposition of anthropogenic secondary organic aerosol
 'aerddpsoaa' = {
@@ -689,8 +808,8 @@
 	 discipline = 0 ;
 	 parameterCategory = 20 ;
 	 parameterNumber = 10 ;
-	 is_aerosol = 1 ;
 	 aerosolType = 62033 ;
+	 is_aerosol = 1 ;
 	}
 #Vertically integrated mass of anthropogenic secondary organic aerosol
 'aermsssoaa' = {
@@ -1842,10 +1961,10 @@
 	 parameterCategory = 2 ;
 	 parameterNumber = 22 ;
 	 typeOfFirstFixedSurface = 103 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
 	 scaledValueOfFirstFixedSurface = 10 ;
-	 typeOfStatisticalProcessing = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
 	 indicatorOfUnitForTimeRange = 1 ;
+	 typeOfStatisticalProcessing = 2 ;
 	 lengthOfTimeRange = 3 ;
 	}
 #Instantaneous 10 metre wind gust
@@ -1875,12 +1994,6 @@
 	 parameterCategory = 19 ;
 	 parameterNumber = 19 ;
 	}
-#Fraction of stratiform precipitation cover
-'fspc' = {
-	 discipline = 0 ;
-	 parameterCategory = 6 ;
-	 parameterNumber = 36 ;
-	}
 #Fraction of convective precipitation cover
 'fcpc' = {
 	 discipline = 0 ;
@@ -1892,21 +2005,21 @@
 	 discipline = 0 ;
 	 parameterCategory = 7 ;
 	 parameterNumber = 6 ;
-	 typeOfStatisticalProcessing = 2 ;
-	 typeOfSecondFixedSurface = 8 ;
-	 lengthOfTimeRange = 6 ;
-	 indicatorOfUnitForTimeRange = 1 ;
 	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	 indicatorOfUnitForTimeRange = 1 ;
+	 typeOfStatisticalProcessing = 2 ;
+	 lengthOfTimeRange = 6 ;
 	}
 #Maximum CAPES in the last 6 hours
 'mxcapes6' = {
 	 discipline = 0 ;
 	 parameterCategory = 7 ;
 	 parameterNumber = 19 ;
-	 indicatorOfUnitForTimeRange = 1 ;
 	 typeOfFirstFixedSurface = 1 ;
-	 typeOfStatisticalProcessing = 2 ;
 	 typeOfSecondFixedSurface = 8 ;
+	 indicatorOfUnitForTimeRange = 1 ;
+	 typeOfStatisticalProcessing = 2 ;
 	 lengthOfTimeRange = 6 ;
 	}
 #2 metre relative humidity with respect to water
@@ -1915,8 +2028,8 @@
 	 parameterCategory = 1 ;
 	 parameterNumber = 93 ;
 	 typeOfFirstFixedSurface = 103 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
 	 scaledValueOfFirstFixedSurface = 2 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
 	}
 #Liquid water content in snow pack
 'lwcs' = {
@@ -1951,9 +2064,9 @@
 	 discipline = 0 ;
 	 parameterCategory = 17 ;
 	 parameterNumber = 4 ;
-	 indicatorOfUnitForTimeRange = 1 ;
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfSecondFixedSurface = 8 ;
+	 indicatorOfUnitForTimeRange = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	 lengthOfTimeRange = 1 ;
 	}
@@ -1962,8 +2075,8 @@
 	 discipline = 0 ;
 	 parameterCategory = 17 ;
 	 parameterNumber = 2 ;
-	 typeOfSecondFixedSurface = 8 ;
 	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
 	}
 #Averaged cloud-to-ground lightning flash density in the last hour
 'licga1' = {
@@ -1972,9 +2085,9 @@
 	 parameterNumber = 2 ;
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfSecondFixedSurface = 8 ;
+	 indicatorOfUnitForTimeRange = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	 lengthOfTimeRange = 1 ;
-	 indicatorOfUnitForTimeRange = 1 ;
 	}
 #Unbalanced component of specific humidity
 'ucq' = {
@@ -2001,31 +2114,31 @@
 	 parameterNumber = 4 ;
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfSecondFixedSurface = 8 ;
+	 indicatorOfUnitForTimeRange = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	 lengthOfTimeRange = 3 ;
-	 indicatorOfUnitForTimeRange = 1 ;
 	}
 #Averaged total lightning flash density in the last 6 hours
 'litota6' = {
 	 discipline = 0 ;
 	 parameterCategory = 17 ;
 	 parameterNumber = 4 ;
-	 typeOfStatisticalProcessing = 0 ;
-	 lengthOfTimeRange = 6 ;
-	 indicatorOfUnitForTimeRange = 1 ;
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfSecondFixedSurface = 8 ;
+	 indicatorOfUnitForTimeRange = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 lengthOfTimeRange = 6 ;
 	}
 #Averaged cloud-to-ground lightning flash density in the last 3 hours
 'licga3' = {
 	 discipline = 0 ;
 	 parameterCategory = 17 ;
 	 parameterNumber = 2 ;
-	 typeOfStatisticalProcessing = 0 ;
 	 typeOfFirstFixedSurface = 1 ;
-	 lengthOfTimeRange = 3 ;
 	 typeOfSecondFixedSurface = 8 ;
 	 indicatorOfUnitForTimeRange = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 lengthOfTimeRange = 3 ;
 	}
 #Averaged cloud-to-ground lightning flash density in the last 6 hours
 'licga6' = {
@@ -2033,58 +2146,80 @@
 	 parameterCategory = 17 ;
 	 parameterNumber = 2 ;
 	 typeOfFirstFixedSurface = 1 ;
-	 typeOfStatisticalProcessing = 0 ;
 	 typeOfSecondFixedSurface = 8 ;
-	 lengthOfTimeRange = 6 ;
 	 indicatorOfUnitForTimeRange = 1 ;
+	 typeOfStatisticalProcessing = 0 ;
+	 lengthOfTimeRange = 6 ;
 	}
 #Soil moisture top 20 cm
 'sm20' = {
 	 discipline = 2 ;
 	 parameterCategory = 0 ;
 	 parameterNumber = 22 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
+	 typeOfFirstFixedSurface = 106 ;
-	 scaledValueOfFirstFixedSurface = 0 ;
 	 typeOfSecondFixedSurface = 106 ;
+	 scaledValueOfFirstFixedSurface = 0 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
 	 scaledValueOfSecondFixedSurface = 2 ;
 	 scaleFactorOfSecondFixedSurface = 1 ;
-	 typeOfFirstFixedSurface = 106 ;
 	}
 #Soil moisture top 100 cm
 'sm100' = {
 	 discipline = 2 ;
 	 parameterCategory = 0 ;
 	 parameterNumber = 22 ;
+	 typeOfFirstFixedSurface = 106 ;
+	 typeOfSecondFixedSurface = 106 ;
+	 scaledValueOfFirstFixedSurface = 0 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
 	 scaledValueOfSecondFixedSurface = 10 ;
 	 scaleFactorOfSecondFixedSurface = 1 ;
-	 typeOfFirstFixedSurface = 106 ;
+	}
-	 scaleFactorOfFirstFixedSurface = 0 ;
+#Total column rain water
-	 scaledValueOfFirstFixedSurface = 0 ;
+'tcrw' = {
-	 typeOfSecondFixedSurface = 106 ;
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 45 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
+#Total column snow water
+'tcsw' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 46 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
+#Ice temperature
+'ist' = {
+	 discipline = 1 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 6 ;
 	}
 #Soil temperature top 20 cm
 'st20' = {
 	 discipline = 2 ;
 	 parameterCategory = 0 ;
 	 parameterNumber = 2 ;
-	 scaledValueOfFirstFixedSurface = 0 ;
+	 typeOfFirstFixedSurface = 106 ;
 	 typeOfSecondFixedSurface = 106 ;
+	 scaledValueOfFirstFixedSurface = 0 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
 	 scaledValueOfSecondFixedSurface = 2 ;
 	 scaleFactorOfSecondFixedSurface = 1 ;
-	 typeOfFirstFixedSurface = 106 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
 	}
 #Soil temperature top 100 cm
 'st100' = {
 	 discipline = 2 ;
 	 parameterCategory = 0 ;
 	 parameterNumber = 2 ;
-	 scaleFactorOfSecondFixedSurface = 1 ;
 	 typeOfFirstFixedSurface = 106 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	 scaledValueOfFirstFixedSurface = 0 ;
 	 typeOfSecondFixedSurface = 106 ;
+	 scaledValueOfFirstFixedSurface = 0 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
 	 scaledValueOfSecondFixedSurface = 10 ;
+	 scaleFactorOfSecondFixedSurface = 1 ;
 	}
 #Atmosphere emission mass flux of Methane from Wetlands
 'e_WLCH4' = {
@@ -2109,6 +2244,13 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 33 ;
 	}
+#Instantaneous large-scale surface precipitation fraction
+'ilspf' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 36 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
 #Convective rain rate
 'crr' = {
 	 discipline = 0 ;
@@ -2191,9 +2333,9 @@
 	 discipline = 0 ;
 	 parameterCategory = 2 ;
 	 parameterNumber = 2 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
-	 scaledValueOfFirstFixedSurface = 200 ;
 	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
 	}
 #200 metre V wind component
 'v200' = {
@@ -2201,8 +2343,8 @@
 	 parameterCategory = 2 ;
 	 parameterNumber = 3 ;
 	 typeOfFirstFixedSurface = 103 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
 	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
 	}
 #200 metre wind speed
 'si200' = {
@@ -2210,16 +2352,16 @@
 	 parameterCategory = 2 ;
 	 parameterNumber = 1 ;
 	 typeOfFirstFixedSurface = 103 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
 	 scaledValueOfFirstFixedSurface = 200 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
 	}
 #100 metre wind speed
 'si100' = {
 	 discipline = 0 ;
 	 parameterCategory = 2 ;
 	 parameterNumber = 1 ;
-	 scaledValueOfFirstFixedSurface = 100 ;
 	 typeOfFirstFixedSurface = 103 ;
+	 scaledValueOfFirstFixedSurface = 100 ;
 	 scaleFactorOfFirstFixedSurface = 0 ;
 	}
 #Urban cover
@@ -2288,6 +2430,37 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 49 ;
 	}
+#Accumulated freezing rain water equivalent
+'fzrawe' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 67 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Runoff water equivalent
+'rowe' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 42 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Snow evaporation water equivalent
+'eswe' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 148 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Total snowfall water equivalent
+'asnowwe' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 53 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
 #Mean temperature tendency due to short-wave radiation
 'mttswr' = {
 	 discipline = 0 ;
@@ -2511,18 +2684,18 @@
 	 discipline = 1 ;
 	 parameterCategory = 0 ;
 	 parameterNumber = 7 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	 lengthOfTimeRange = 6 ;
-	 indicatorOfUnitForTimeRange = 1 ;
-	 typeOfFirstFixedSurface = 1 ;
 	}
 #Mean discharge in the last 24 hours
 'dis24' = {
 	 discipline = 1 ;
 	 parameterCategory = 0 ;
 	 parameterNumber = 7 ;
-	 indicatorOfUnitForTimeRange = 1 ;
 	 typeOfFirstFixedSurface = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	 lengthOfTimeRange = 24 ;
 	}
@@ -2671,19 +2844,13 @@
 	 parameterCategory = 6 ;
 	 parameterNumber = 22 ;
 	}
-#Evaporation rate
-'evarate' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 79 ;
-	}
 #Evaporation
 'eva' = {
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
 	 parameterNumber = 79 ;
-	 typeOfStatisticalProcessing = 1 ;
 	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #10 metre wind direction
 'wdir10' = {
@@ -2691,8 +2858,8 @@
 	 parameterCategory = 2 ;
 	 parameterNumber = 0 ;
 	 typeOfFirstFixedSurface = 103 ;
-	 scaleFactorOfFirstFixedSurface = 0 ;
 	 scaledValueOfFirstFixedSurface = 10 ;
+	 scaleFactorOfFirstFixedSurface = 0 ;
 	}
 #Direct short wave radiation flux
 'dirswrf' = {
@@ -2711,8 +2878,8 @@
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
 	 parameterNumber = 13 ;
-	 typeOfStatisticalProcessing = 1 ;
 	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Evaporation in the last 6 hours
 'eva06' = {
@@ -2720,17 +2887,17 @@
 	 parameterCategory = 1 ;
 	 parameterNumber = 79 ;
 	 typeOfFirstFixedSurface = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	 lengthOfTimeRange = 6 ;
-	 indicatorOfUnitForTimeRange = 1 ;
 	}
 #Evaporation in the last 24 hours
 'eva24' = {
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
 	 parameterNumber = 79 ;
-	 indicatorOfUnitForTimeRange = 1 ;
 	 typeOfFirstFixedSurface = 1 ;
+	 indicatorOfUnitForTimeRange = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	 lengthOfTimeRange = 24 ;
 	}
@@ -4720,6 +4887,22 @@
 	 parameterNumber = 3 ;
 	 typeOfFirstFixedSurface = 160 ;
 	}
+#Vertical integral of eastward water vapour flux
+'viwve' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 150 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
+#Vertical integral of northward water vapour flux
+'viwvn' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 151 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
 #Surface runoff
 'sro' = {
 	 discipline = 2 ;
@@ -4794,6 +4977,12 @@
 	 typeOfGeneratingProcess = 20 ;
 	 is_chemical = 1 ;
 	}
+#Friction velocity
+'zust' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 17 ;
+	}
 #Lake total depth
 'dl' = {
 	 discipline = 1 ;
@@ -5017,12 +5206,6 @@
 	 parameterCategory = 2 ;
 	 parameterNumber = 12 ;
 	}
-#Boundary layer dissipation
-'bld' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 20 ;
-	}
 #Surface sensible heat flux
 'sshf' = {
 	 discipline = 0 ;
@@ -5113,7 +5296,7 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 1 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'ssr' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -5121,7 +5304,7 @@
 	 typeOfStatisticalProcessing = 1 ;
 	 typeOfFirstFixedSurface = 1 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'str' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
@@ -5129,7 +5312,7 @@
 	 typeOfStatisticalProcessing = 1 ;
 	 typeOfFirstFixedSurface = 1 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 'ttr' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
@@ -5173,12 +5356,6 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 10 ;
 	}
-#Sensible heat net flux
-'shtfl' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 11 ;
-	}
 #Heat index
 'heatx' = {
 	 discipline = 0 ;
@@ -5448,6 +5625,7 @@
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
 	 parameterNumber = 52 ;
+	 typeOfFirstFixedSurface = 1 ;
 	}
 #Total snowfall rate water equivalent
 'tsrwe' = {
@@ -5472,6 +5650,7 @@
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
 	 parameterNumber = 56 ;
+	 typeOfFirstFixedSurface = 1 ;
 	}
 #Total snowfall rate
 'tsrate' = {
@@ -5647,12 +5826,6 @@
 	 parameterCategory = 3 ;
 	 parameterNumber = 17 ;
 	}
-#Planetary boundary layer height
-'hpbl' = {
-	 discipline = 0 ;
-	 parameterCategory = 3 ;
-	 parameterNumber = 18 ;
-	}
 #5-wave geopotential height anomaly
 'p260084' = {
 	 discipline = 0 ;

definitions/grib2/localConcepts/ecmf/cfName.def

@@ -20,9 +20,12 @@
 	}
 #Large-scale precipitation
 'lwe_thickness_of_stratiform_precipitation_amount' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 142 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 196 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Convective precipitation
 'lwe_thickness_of_convective_precipitation_amount' = {
@@ -33,9 +36,12 @@
 	}
 #Snowfall
 'lwe_thickness_of_snowfall_amount' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 144 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 198 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Tendency of surface pressure
 'tendency_of_surface_air_pressure' = {
@@ -45,9 +51,12 @@
 	}
 #Total cloud cover
 'cloud_area_fraction' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 164 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
 	}
 #Albedo
 'surface_albedo' = {
@@ -57,9 +66,12 @@
 	}
 #Evaporation
 'lwe_thickness_of_water_evaporation_amount' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 182 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 199 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Convective cloud cover
 'convective_cloud_area_fraction' = {

definitions/grib2/localConcepts/ecmf/cfName.legacy.def

@@ -112,3 +112,27 @@
  parameterCategory = 128 ;
  parameterNumber = 137 ;
 }
+#Large-scale precipitation
+'lwe_thickness_of_stratiform_precipitation_amount' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 142 ;
+}
+#Snowfall
+'lwe_thickness_of_snowfall_amount' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 144 ;
+}
+#Total cloud cover
+'cloud_area_fraction' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 164 ;
+}
+#Evaporation
+'lwe_thickness_of_water_evaporation_amount' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 182 ;
+}

definitions/grib2/localConcepts/ecmf/cfVarName.def

@@ -25,9 +25,12 @@
 	}
 #Surface runoff
 'sro' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 2 ;
-	 parameterNumber = 8 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 202 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Sub-surface runoff
 'ssro' = {
@@ -157,9 +160,11 @@
 	}
 #Snow albedo
 'asn' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 32 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
 	}
 #Ice temperature layer 1
 'istl1' = {
@@ -211,15 +216,21 @@
 	}
 #Snow evaporation
 'es' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 44 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 197 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Snowmelt
 'smlt' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 2 ;
-	 parameterNumber = 45 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 203 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Solar duration
 'sdur' = {
@@ -233,12 +244,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 48 ;
 	}
-#Large-scale precipitation fraction
-'lspf' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 50 ;
-	}
 #Maximum temperature at 2 metres in the last 24 hours
 'mx2t24' = {
 	 discipline = 0 ;
@@ -281,18 +286,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 56 ;
 	}
-#Downward UV radiation at the surface
-'uvb' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 57 ;
-	}
-#Photosynthetically active radiation at the surface
-'par' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 58 ;
-	}
 #Observation count
 'obct' = {
 	 discipline = 192 ;
@@ -674,9 +667,12 @@
 	}
 #Large-scale precipitation
 'lsp' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 142 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 196 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Convective precipitation
 'cp' = {
@@ -687,9 +683,12 @@
 	}
 #Snowfall
 'sf' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 144 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 198 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Charnock
 'chnk' = {
@@ -734,12 +733,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 158 ;
 	}
-#Boundary layer height
-'blh' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 159 ;
-	}
 #Standard deviation of orography
 'sdor' = {
 	 discipline = 192 ;
@@ -766,9 +759,12 @@
 	}
 #Total cloud cover
 'tcc' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 164 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
 	}
 #Soil temperature level 2
 'stl2' = {
@@ -790,9 +786,12 @@
 	}
 #Evaporation
 'e' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 182 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 199 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Soil temperature level 3
 'stl3' = {
@@ -814,21 +813,24 @@
 	}
 #Low cloud cover
 'lcc' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 186 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 193 ;
 	}
 #Medium cloud cover
 'mcc' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 187 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 194 ;
 	}
 #High cloud cover
 'hcc' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 188 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 195 ;
 	}
 #East-West component of sub-gridscale orographic variance
 'ewov' = {
@@ -854,24 +856,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 193 ;
 	}
-#Eastward gravity wave surface stress
-'lgws' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 195 ;
-	}
-#Northward gravity wave surface stress
-'mgws' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 196 ;
-	}
-#Gravity wave dissipation
-'gwd' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 197 ;
-	}
 #Skin reservoir content
 'src' = {
 	 discipline = 192 ;
@@ -910,24 +894,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 206 ;
 	}
-#Top net solar radiation, clear sky
-'tsrc' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 208 ;
-	}
-#Top net thermal radiation, clear sky
-'ttrc' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 209 ;
-	}
-#TOA incident solar radiation
-'tisr' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 212 ;
-	}
 #Vertically integrated moisture divergence
 'vimd' = {
 	 discipline = 192 ;
@@ -1028,30 +994,6 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Instantaneous eastward turbulent surface stress
-'iews' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 229 ;
-	}
-#Instantaneous northward turbulent surface stress
-'inss' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 230 ;
-	}
-#Instantaneous surface sensible heat flux
-'ishf' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 231 ;
-	}
-#Instantaneous moisture flux
-'ie' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 232 ;
-	}
 #Apparent surface humidity
 'asq' = {
 	 discipline = 192 ;
@@ -5128,6 +5070,432 @@
 	 parameterCategory = 213 ;
 	 parameterNumber = 150 ;
 	}
+#Random pattern 51 for SPP scheme
+'spp51' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 151 ;
+	}
+#Random pattern 52 for SPP scheme
+'spp52' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 152 ;
+	}
+#Random pattern 53 for SPP scheme
+'spp53' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 153 ;
+	}
+#Random pattern 54 for SPP scheme
+'spp54' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 154 ;
+	}
+#Random pattern 55 for SPP scheme
+'spp55' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 155 ;
+	}
+#Random pattern 56 for SPP scheme
+'spp56' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 156 ;
+	}
+#Random pattern 57 for SPP scheme
+'spp57' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 157 ;
+	}
+#Random pattern 58 for SPP scheme
+'spp58' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 158 ;
+	}
+#Random pattern 59 for SPP scheme
+'spp59' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 159 ;
+	}
+#Random pattern 60 for SPP scheme
+'spp60' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 160 ;
+	}
+#Random pattern 61 for SPP scheme
+'spp61' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 161 ;
+	}
+#Random pattern 62 for SPP scheme
+'spp62' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 162 ;
+	}
+#Random pattern 63 for SPP scheme
+'spp63' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 163 ;
+	}
+#Random pattern 64 for SPP scheme
+'spp64' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 164 ;
+	}
+#Random pattern 65 for SPP scheme
+'spp65' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 165 ;
+	}
+#Random pattern 66 for SPP scheme
+'spp66' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 166 ;
+	}
+#Random pattern 67 for SPP scheme
+'spp67' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 167 ;
+	}
+#Random pattern 68 for SPP scheme
+'spp68' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 168 ;
+	}
+#Random pattern 69 for SPP scheme
+'spp69' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 169 ;
+	}
+#Random pattern 70 for SPP scheme
+'spp70' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 170 ;
+	}
+#Random pattern 71 for SPP scheme
+'spp71' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 171 ;
+	}
+#Random pattern 72 for SPP scheme
+'spp72' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 172 ;
+	}
+#Random pattern 73 for SPP scheme
+'spp73' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 173 ;
+	}
+#Random pattern 74 for SPP scheme
+'spp74' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 174 ;
+	}
+#Random pattern 75 for SPP scheme
+'spp75' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 175 ;
+	}
+#Random pattern 76 for SPP scheme
+'spp76' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 176 ;
+	}
+#Random pattern 77 for SPP scheme
+'spp77' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 177 ;
+	}
+#Random pattern 78 for SPP scheme
+'spp78' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 178 ;
+	}
+#Random pattern 79 for SPP scheme
+'spp79' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 179 ;
+	}
+#Random pattern 80 for SPP scheme
+'spp80' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 180 ;
+	}
+#Random pattern 81 for SPP scheme
+'spp81' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 181 ;
+	}
+#Random pattern 82 for SPP scheme
+'spp82' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 182 ;
+	}
+#Random pattern 83 for SPP scheme
+'spp83' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 183 ;
+	}
+#Random pattern 84 for SPP scheme
+'spp84' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 184 ;
+	}
+#Random pattern 85 for SPP scheme
+'spp85' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 185 ;
+	}
+#Random pattern 86 for SPP scheme
+'spp86' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 186 ;
+	}
+#Random pattern 87 for SPP scheme
+'spp87' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 187 ;
+	}
+#Random pattern 88 for SPP scheme
+'spp88' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 188 ;
+	}
+#Random pattern 89 for SPP scheme
+'spp89' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 189 ;
+	}
+#Random pattern 90 for SPP scheme
+'spp90' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 190 ;
+	}
+#Random pattern 91 for SPP scheme
+'spp91' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 191 ;
+	}
+#Random pattern 92 for SPP scheme
+'spp92' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 192 ;
+	}
+#Random pattern 93 for SPP scheme
+'spp93' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 193 ;
+	}
+#Random pattern 94 for SPP scheme
+'spp94' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 194 ;
+	}
+#Random pattern 95 for SPP scheme
+'spp95' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 195 ;
+	}
+#Random pattern 96 for SPP scheme
+'spp96' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 196 ;
+	}
+#Random pattern 97 for SPP scheme
+'spp97' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 197 ;
+	}
+#Random pattern 98 for SPP scheme
+'spp98' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 198 ;
+	}
+#Random pattern 99 for SPP scheme
+'spp99' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 199 ;
+	}
+#Random pattern 100 for SPP scheme
+'spp100' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 200 ;
+	}
+#Random pattern 101 for SPP scheme
+'spp101' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 201 ;
+	}
+#Random pattern 102 for SPP scheme
+'spp102' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 202 ;
+	}
+#Random pattern 103 for SPP scheme
+'spp103' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 203 ;
+	}
+#Random pattern 104 for SPP scheme
+'spp104' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 204 ;
+	}
+#Random pattern 105 for SPP scheme
+'spp105' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 205 ;
+	}
+#Random pattern 106 for SPP scheme
+'spp106' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 206 ;
+	}
+#Random pattern 107 for SPP scheme
+'spp107' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 207 ;
+	}
+#Random pattern 108 for SPP scheme
+'spp108' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 208 ;
+	}
+#Random pattern 109 for SPP scheme
+'spp109' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 209 ;
+	}
+#Random pattern 110 for SPP scheme
+'spp110' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 210 ;
+	}
+#Random pattern 111 for SPP scheme
+'spp111' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 211 ;
+	}
+#Random pattern 112 for SPP scheme
+'spp112' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 212 ;
+	}
+#Random pattern 113 for SPP scheme
+'spp113' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 213 ;
+	}
+#Random pattern 114 for SPP scheme
+'spp114' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 214 ;
+	}
+#Random pattern 115 for SPP scheme
+'spp115' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 215 ;
+	}
+#Random pattern 116 for SPP scheme
+'spp116' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 216 ;
+	}
+#Random pattern 117 for SPP scheme
+'spp117' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 217 ;
+	}
+#Random pattern 118 for SPP scheme
+'spp118' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 218 ;
+	}
+#Random pattern 119 for SPP scheme
+'spp119' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 219 ;
+	}
+#Random pattern 120 for SPP scheme
+'spp120' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 220 ;
+	}
+#Random pattern 121 for SPP scheme
+'spp121' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 221 ;
+	}
 #Cosine of solar zenith angle
 'uvcossza' = {
 	 discipline = 192 ;
@@ -13541,18 +13909,6 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 196 ;
 	}
-#Total column rain water
-'tcrw' = {
-	 discipline = 192 ;
-	 parameterCategory = 228 ;
-	 parameterNumber = 89 ;
-	}
-#Total column snow water
-'tcsw' = {
-	 discipline = 192 ;
-	 parameterCategory = 228 ;
-	 parameterNumber = 90 ;
-	}
 #Canopy cover fraction
 'ccf' = {
 	 discipline = 192 ;
@@ -13571,12 +13927,6 @@
 	 parameterCategory = 228 ;
 	 parameterNumber = 93 ;
 	}
-#Ice temperature
-'ist' = {
-	 discipline = 192 ;
-	 parameterCategory = 228 ;
-	 parameterNumber = 94 ;
-	}
 #Evaporation from the top of canopy
 'evatc' = {
 	 discipline = 192 ;
@@ -13688,9 +14038,12 @@
 	}
 #Potential evaporation
 'pev' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 228 ;
+	 discipline = 0 ;
-	 parameterNumber = 251 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 200 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Irrigation
 'irr' = {
@@ -17509,18 +17862,6 @@
 	 parameterCategory = 162 ;
 	 parameterNumber = 70 ;
 	}
-#Vertical integral of eastward water vapour flux
-'viwve' = {
-	 discipline = 192 ;
-	 parameterCategory = 162 ;
-	 parameterNumber = 71 ;
-	}
-#Vertical integral of northward water vapour flux
-'viwvn' = {
-	 discipline = 192 ;
-	 parameterCategory = 162 ;
-	 parameterNumber = 72 ;
-	}
 #Vertical integral of eastward geopotential flux
 'vige' = {
 	 discipline = 192 ;
@@ -21859,12 +22200,6 @@
 	 parameterCategory = 220 ;
 	 parameterNumber = 228 ;
 	}
-#Friction velocity
-'zust' = {
-	 discipline = 192 ;
-	 parameterCategory = 228 ;
-	 parameterNumber = 3 ;
-	}
 #Mean temperature at 2 metres
 'mean2t' = {
 	 discipline = 192 ;

definitions/grib2/localConcepts/ecmf/cfVarName.legacy.def

@@ -400,3 +400,195 @@
  parameterCategory = 228 ;
  parameterNumber = 60 ;
 }
+#Eastward gravity wave surface stress
+'lgws' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 195 ;
+}
+#Friction velocity
+'zust' = {
+ discipline = 192 ;
+ parameterCategory = 228 ;
+ parameterNumber = 3 ;
+}
+#Instantaneous eastward turbulent surface stress
+'iews' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 229 ;
+}
+#Instantaneous northward turbulent surface stress
+'inss' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 230 ;
+}
+#Instantaneous surface sensible heat flux
+'ishf' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 231 ;
+}
+#Instantaneous moisture flux
+'ie' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 232 ;
+}
+#Large-scale precipitation
+'lsp' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 142 ;
+}
+#Large-scale precipitation fraction
+'lspf' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 50 ;
+}
+#Northward gravity wave surface stress
+'mgws' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 196 ;
+}
+#Snow evaporation
+'es' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 44 ;
+}
+#Snowfall
+'sf' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 144 ;
+}
+#Surface runoff
+'sro' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 8 ;
+}
+#TOA incident solar radiation
+'tisr' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 212 ;
+}
+#Top net thermal radiation, clear sky
+'ttrc' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 209 ;
+}
+#Top net solar radiation, clear sky
+'tsrc' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 208 ;
+}
+#Total cloud cover
+'tcc' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 164 ;
+}
+#Total column rain water
+'tcrw' = {
+ discipline = 192 ;
+ parameterCategory = 228 ;
+ parameterNumber = 89 ;
+}
+#Total column snow water
+'tcsw' = {
+ discipline = 192 ;
+ parameterCategory = 228 ;
+ parameterNumber = 90 ;
+}
+#Vertical integral of eastward water vapour flux
+'viwve' = {
+ discipline = 192 ;
+ parameterCategory = 162 ;
+ parameterNumber = 71 ;
+}
+#Vertical integral of northward water vapour flux
+'viwvn' = {
+ discipline = 192 ;
+ parameterCategory = 162 ;
+ parameterNumber = 72 ;
+}
+#Snow albedo
+'asn' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 32 ;
+}
+#Ice temperature
+'ist' = {
+ discipline = 192 ;
+ parameterCategory = 228 ;
+ parameterNumber = 94 ;
+}
+#Snowmelt
+'smlt' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 45 ;
+}
+#Downward UV radiation at the surface
+'uvb' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 57 ;
+}
+#Photosynthetically active radiation at the surface
+'par' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 58 ;
+}
+#Boundary layer height
+'blh' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 159 ;
+}
+#Evaporation
+'e' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 182 ;
+}
+#Low cloud cover
+'lcc' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 186 ;
+}
+#Medium cloud cover
+'mcc' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 187 ;
+}
+#High cloud cover
+'hcc' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 188 ;
+}
+#Gravity wave dissipation
+'gwd' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 197 ;
+}
+#Potential evaporation
+'pev' = {
+ discipline = 192 ;
+ parameterCategory = 228 ;
+ parameterNumber = 251 ;
+}

definitions/grib2/localConcepts/ecmf/name.def

@@ -25,9 +25,12 @@
 	}
 #Surface runoff
 'Surface runoff' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 2 ;
-	 parameterNumber = 8 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 202 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Sub-surface runoff
 'Sub-surface runoff' = {
@@ -157,9 +160,11 @@
 	}
 #Snow albedo
 'Snow albedo' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 32 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
 	}
 #Ice temperature layer 1
 'Ice temperature layer 1' = {
@@ -211,15 +216,21 @@
 	}
 #Snow evaporation
 'Snow evaporation' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 44 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 197 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Snowmelt
 'Snowmelt' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 2 ;
-	 parameterNumber = 45 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 203 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Solar duration
 'Solar duration' = {
@@ -233,12 +244,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 48 ;
 	}
-#Large-scale precipitation fraction
-'Large-scale precipitation fraction' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 50 ;
-	}
 #Maximum temperature at 2 metres in the last 24 hours
 'Maximum temperature at 2 metres in the last 24 hours' = {
 	 discipline = 0 ;
@@ -281,18 +286,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 56 ;
 	}
-#Downward UV radiation at the surface
-'Downward UV radiation at the surface' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 57 ;
-	}
-#Photosynthetically active radiation at the surface
-'Photosynthetically active radiation at the surface' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 58 ;
-	}
 #Observation count
 'Observation count' = {
 	 discipline = 192 ;
@@ -674,9 +667,12 @@
 	}
 #Large-scale precipitation
 'Large-scale precipitation' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 142 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 196 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Convective precipitation
 'Convective precipitation' = {
@@ -687,9 +683,12 @@
 	}
 #Snowfall
 'Snowfall' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 144 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 198 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Charnock
 'Charnock' = {
@@ -734,12 +733,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 158 ;
 	}
-#Boundary layer height
-'Boundary layer height' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 159 ;
-	}
 #Standard deviation of orography
 'Standard deviation of orography' = {
 	 discipline = 192 ;
@@ -766,9 +759,12 @@
 	}
 #Total cloud cover
 'Total cloud cover' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 164 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
 	}
 #Soil temperature level 2
 'Soil temperature level 2' = {
@@ -790,9 +786,12 @@
 	}
 #Evaporation
 'Evaporation' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 182 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 199 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Soil temperature level 3
 'Soil temperature level 3' = {
@@ -814,21 +813,24 @@
 	}
 #Low cloud cover
 'Low cloud cover' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 186 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 193 ;
 	}
 #Medium cloud cover
 'Medium cloud cover' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 187 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 194 ;
 	}
 #High cloud cover
 'High cloud cover' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 188 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 195 ;
 	}
 #East-West component of sub-gridscale orographic variance
 'East-West component of sub-gridscale orographic variance' = {
@@ -854,24 +856,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 193 ;
 	}
-#Eastward gravity wave surface stress
-'Eastward gravity wave surface stress' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 195 ;
-	}
-#Northward gravity wave surface stress
-'Northward gravity wave surface stress' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 196 ;
-	}
-#Gravity wave dissipation
-'Gravity wave dissipation' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 197 ;
-	}
 #Skin reservoir content
 'Skin reservoir content' = {
 	 discipline = 192 ;
@@ -910,24 +894,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 206 ;
 	}
-#Top net solar radiation, clear sky
-'Top net solar radiation, clear sky' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 208 ;
-	}
-#Top net thermal radiation, clear sky
-'Top net thermal radiation, clear sky' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 209 ;
-	}
-#TOA incident solar radiation
-'TOA incident solar radiation' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 212 ;
-	}
 #Vertically integrated moisture divergence
 'Vertically integrated moisture divergence' = {
 	 discipline = 192 ;
@@ -1028,30 +994,6 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Instantaneous eastward turbulent surface stress
-'Instantaneous eastward turbulent surface stress' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 229 ;
-	}
-#Instantaneous northward turbulent surface stress
-'Instantaneous northward turbulent surface stress' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 230 ;
-	}
-#Instantaneous surface sensible heat flux
-'Instantaneous surface sensible heat flux' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 231 ;
-	}
-#Instantaneous moisture flux
-'Instantaneous moisture flux' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 232 ;
-	}
 #Apparent surface humidity
 'Apparent surface humidity' = {
 	 discipline = 192 ;
@@ -5128,6 +5070,432 @@
 	 parameterCategory = 213 ;
 	 parameterNumber = 150 ;
 	}
+#Random pattern 51 for SPP scheme
+'Random pattern 51 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 151 ;
+	}
+#Random pattern 52 for SPP scheme
+'Random pattern 52 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 152 ;
+	}
+#Random pattern 53 for SPP scheme
+'Random pattern 53 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 153 ;
+	}
+#Random pattern 54 for SPP scheme
+'Random pattern 54 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 154 ;
+	}
+#Random pattern 55 for SPP scheme
+'Random pattern 55 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 155 ;
+	}
+#Random pattern 56 for SPP scheme
+'Random pattern 56 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 156 ;
+	}
+#Random pattern 57 for SPP scheme
+'Random pattern 57 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 157 ;
+	}
+#Random pattern 58 for SPP scheme
+'Random pattern 58 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 158 ;
+	}
+#Random pattern 59 for SPP scheme
+'Random pattern 59 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 159 ;
+	}
+#Random pattern 60 for SPP scheme
+'Random pattern 60 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 160 ;
+	}
+#Random pattern 61 for SPP scheme
+'Random pattern 61 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 161 ;
+	}
+#Random pattern 62 for SPP scheme
+'Random pattern 62 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 162 ;
+	}
+#Random pattern 63 for SPP scheme
+'Random pattern 63 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 163 ;
+	}
+#Random pattern 64 for SPP scheme
+'Random pattern 64 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 164 ;
+	}
+#Random pattern 65 for SPP scheme
+'Random pattern 65 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 165 ;
+	}
+#Random pattern 66 for SPP scheme
+'Random pattern 66 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 166 ;
+	}
+#Random pattern 67 for SPP scheme
+'Random pattern 67 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 167 ;
+	}
+#Random pattern 68 for SPP scheme
+'Random pattern 68 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 168 ;
+	}
+#Random pattern 69 for SPP scheme
+'Random pattern 69 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 169 ;
+	}
+#Random pattern 70 for SPP scheme
+'Random pattern 70 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 170 ;
+	}
+#Random pattern 71 for SPP scheme
+'Random pattern 71 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 171 ;
+	}
+#Random pattern 72 for SPP scheme
+'Random pattern 72 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 172 ;
+	}
+#Random pattern 73 for SPP scheme
+'Random pattern 73 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 173 ;
+	}
+#Random pattern 74 for SPP scheme
+'Random pattern 74 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 174 ;
+	}
+#Random pattern 75 for SPP scheme
+'Random pattern 75 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 175 ;
+	}
+#Random pattern 76 for SPP scheme
+'Random pattern 76 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 176 ;
+	}
+#Random pattern 77 for SPP scheme
+'Random pattern 77 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 177 ;
+	}
+#Random pattern 78 for SPP scheme
+'Random pattern 78 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 178 ;
+	}
+#Random pattern 79 for SPP scheme
+'Random pattern 79 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 179 ;
+	}
+#Random pattern 80 for SPP scheme
+'Random pattern 80 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 180 ;
+	}
+#Random pattern 81 for SPP scheme
+'Random pattern 81 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 181 ;
+	}
+#Random pattern 82 for SPP scheme
+'Random pattern 82 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 182 ;
+	}
+#Random pattern 83 for SPP scheme
+'Random pattern 83 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 183 ;
+	}
+#Random pattern 84 for SPP scheme
+'Random pattern 84 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 184 ;
+	}
+#Random pattern 85 for SPP scheme
+'Random pattern 85 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 185 ;
+	}
+#Random pattern 86 for SPP scheme
+'Random pattern 86 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 186 ;
+	}
+#Random pattern 87 for SPP scheme
+'Random pattern 87 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 187 ;
+	}
+#Random pattern 88 for SPP scheme
+'Random pattern 88 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 188 ;
+	}
+#Random pattern 89 for SPP scheme
+'Random pattern 89 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 189 ;
+	}
+#Random pattern 90 for SPP scheme
+'Random pattern 90 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 190 ;
+	}
+#Random pattern 91 for SPP scheme
+'Random pattern 91 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 191 ;
+	}
+#Random pattern 92 for SPP scheme
+'Random pattern 92 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 192 ;
+	}
+#Random pattern 93 for SPP scheme
+'Random pattern 93 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 193 ;
+	}
+#Random pattern 94 for SPP scheme
+'Random pattern 94 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 194 ;
+	}
+#Random pattern 95 for SPP scheme
+'Random pattern 95 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 195 ;
+	}
+#Random pattern 96 for SPP scheme
+'Random pattern 96 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 196 ;
+	}
+#Random pattern 97 for SPP scheme
+'Random pattern 97 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 197 ;
+	}
+#Random pattern 98 for SPP scheme
+'Random pattern 98 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 198 ;
+	}
+#Random pattern 99 for SPP scheme
+'Random pattern 99 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 199 ;
+	}
+#Random pattern 100 for SPP scheme
+'Random pattern 100 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 200 ;
+	}
+#Random pattern 101 for SPP scheme
+'Random pattern 101 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 201 ;
+	}
+#Random pattern 102 for SPP scheme
+'Random pattern 102 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 202 ;
+	}
+#Random pattern 103 for SPP scheme
+'Random pattern 103 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 203 ;
+	}
+#Random pattern 104 for SPP scheme
+'Random pattern 104 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 204 ;
+	}
+#Random pattern 105 for SPP scheme
+'Random pattern 105 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 205 ;
+	}
+#Random pattern 106 for SPP scheme
+'Random pattern 106 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 206 ;
+	}
+#Random pattern 107 for SPP scheme
+'Random pattern 107 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 207 ;
+	}
+#Random pattern 108 for SPP scheme
+'Random pattern 108 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 208 ;
+	}
+#Random pattern 109 for SPP scheme
+'Random pattern 109 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 209 ;
+	}
+#Random pattern 110 for SPP scheme
+'Random pattern 110 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 210 ;
+	}
+#Random pattern 111 for SPP scheme
+'Random pattern 111 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 211 ;
+	}
+#Random pattern 112 for SPP scheme
+'Random pattern 112 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 212 ;
+	}
+#Random pattern 113 for SPP scheme
+'Random pattern 113 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 213 ;
+	}
+#Random pattern 114 for SPP scheme
+'Random pattern 114 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 214 ;
+	}
+#Random pattern 115 for SPP scheme
+'Random pattern 115 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 215 ;
+	}
+#Random pattern 116 for SPP scheme
+'Random pattern 116 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 216 ;
+	}
+#Random pattern 117 for SPP scheme
+'Random pattern 117 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 217 ;
+	}
+#Random pattern 118 for SPP scheme
+'Random pattern 118 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 218 ;
+	}
+#Random pattern 119 for SPP scheme
+'Random pattern 119 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 219 ;
+	}
+#Random pattern 120 for SPP scheme
+'Random pattern 120 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 220 ;
+	}
+#Random pattern 121 for SPP scheme
+'Random pattern 121 for SPP scheme' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 221 ;
+	}
 #Cosine of solar zenith angle
 'Cosine of solar zenith angle' = {
 	 discipline = 192 ;
@@ -13541,18 +13909,6 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 196 ;
 	}
-#Total column rain water
-'Total column rain water' = {
-	 discipline = 192 ;
-	 parameterCategory = 228 ;
-	 parameterNumber = 89 ;
-	}
-#Total column snow water
-'Total column snow water' = {
-	 discipline = 192 ;
-	 parameterCategory = 228 ;
-	 parameterNumber = 90 ;
-	}
 #Canopy cover fraction
 'Canopy cover fraction' = {
 	 discipline = 192 ;
@@ -13571,12 +13927,6 @@
 	 parameterCategory = 228 ;
 	 parameterNumber = 93 ;
 	}
-#Ice temperature
-'Ice temperature' = {
-	 discipline = 192 ;
-	 parameterCategory = 228 ;
-	 parameterNumber = 94 ;
-	}
 #Evaporation from the top of canopy
 'Evaporation from the top of canopy' = {
 	 discipline = 192 ;
@@ -13688,9 +14038,12 @@
 	}
 #Potential evaporation
 'Potential evaporation' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 228 ;
+	 discipline = 0 ;
-	 parameterNumber = 251 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 200 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Irrigation
 'Irrigation' = {
@@ -17509,18 +17862,6 @@
 	 parameterCategory = 162 ;
 	 parameterNumber = 70 ;
 	}
-#Vertical integral of eastward water vapour flux
-'Vertical integral of eastward water vapour flux' = {
-	 discipline = 192 ;
-	 parameterCategory = 162 ;
-	 parameterNumber = 71 ;
-	}
-#Vertical integral of northward water vapour flux
-'Vertical integral of northward water vapour flux' = {
-	 discipline = 192 ;
-	 parameterCategory = 162 ;
-	 parameterNumber = 72 ;
-	}
 #Vertical integral of eastward geopotential flux
 'Vertical integral of eastward geopotential flux' = {
 	 discipline = 192 ;
@@ -21859,12 +22200,6 @@
 	 parameterCategory = 220 ;
 	 parameterNumber = 228 ;
 	}
-#Friction velocity
-'Friction velocity' = {
-	 discipline = 192 ;
-	 parameterCategory = 228 ;
-	 parameterNumber = 3 ;
-	}
 #Mean temperature at 2 metres
 'Mean temperature at 2 metres' = {
 	 discipline = 192 ;

definitions/grib2/localConcepts/ecmf/name.legacy.def

@@ -400,3 +400,195 @@
  parameterCategory = 228 ;
  parameterNumber = 60 ;
 }
+#Eastward gravity wave surface stress
+'Eastward gravity wave surface stress' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 195 ;
+}
+#Friction velocity
+'Friction velocity' = {
+ discipline = 192 ;
+ parameterCategory = 228 ;
+ parameterNumber = 3 ;
+}
+#Instantaneous eastward turbulent surface stress
+'Instantaneous eastward turbulent surface stress' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 229 ;
+}
+#Instantaneous northward turbulent surface stress
+'Instantaneous northward turbulent surface stress' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 230 ;
+}
+#Instantaneous surface sensible heat flux
+'Instantaneous surface sensible heat flux' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 231 ;
+}
+#Instantaneous moisture flux
+'Instantaneous moisture flux' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 232 ;
+}
+#Large-scale precipitation
+'Large-scale precipitation' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 142 ;
+}
+#Large-scale precipitation fraction
+'Large-scale precipitation fraction' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 50 ;
+}
+#Northward gravity wave surface stress
+'Northward gravity wave surface stress' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 196 ;
+}
+#Snow evaporation
+'Snow evaporation' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 44 ;
+}
+#Snowfall
+'Snowfall' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 144 ;
+}
+#Surface runoff
+'Surface runoff' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 8 ;
+}
+#TOA incident solar radiation
+'TOA incident solar radiation' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 212 ;
+}
+#Top net thermal radiation, clear sky
+'Top net thermal radiation, clear sky' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 209 ;
+}
+#Top net solar radiation, clear sky
+'Top net solar radiation, clear sky' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 208 ;
+}
+#Total cloud cover
+'Total cloud cover' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 164 ;
+}
+#Total column rain water
+'Total column rain water' = {
+ discipline = 192 ;
+ parameterCategory = 228 ;
+ parameterNumber = 89 ;
+}
+#Total column snow water
+'Total column snow water' = {
+ discipline = 192 ;
+ parameterCategory = 228 ;
+ parameterNumber = 90 ;
+}
+#Vertical integral of eastward water vapour flux
+'Vertical integral of eastward water vapour flux' = {
+ discipline = 192 ;
+ parameterCategory = 162 ;
+ parameterNumber = 71 ;
+}
+#Vertical integral of northward water vapour flux
+'Vertical integral of northward water vapour flux' = {
+ discipline = 192 ;
+ parameterCategory = 162 ;
+ parameterNumber = 72 ;
+}
+#Snow albedo
+'Snow albedo' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 32 ;
+}
+#Ice temperature
+'Ice temperature' = {
+ discipline = 192 ;
+ parameterCategory = 228 ;
+ parameterNumber = 94 ;
+}
+#Snowmelt
+'Snowmelt' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 45 ;
+}
+#Downward UV radiation at the surface
+'Downward UV radiation at the surface' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 57 ;
+}
+#Photosynthetically active radiation at the surface
+'Photosynthetically active radiation at the surface' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 58 ;
+}
+#Boundary layer height
+'Boundary layer height' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 159 ;
+}
+#Evaporation
+'Evaporation' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 182 ;
+}
+#Low cloud cover
+'Low cloud cover' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 186 ;
+}
+#Medium cloud cover
+'Medium cloud cover' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 187 ;
+}
+#High cloud cover
+'High cloud cover' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 188 ;
+}
+#Gravity wave dissipation
+'Gravity wave dissipation' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 197 ;
+}
+#Potential evaporation
+'Potential evaporation' = {
+ discipline = 192 ;
+ parameterCategory = 228 ;
+ parameterNumber = 251 ;
+}

definitions/grib2/localConcepts/ecmf/paramId.def

@@ -25,9 +25,12 @@
 	}
 #Surface runoff
 '8' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 2 ;
-	 parameterNumber = 8 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 202 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Sub-surface runoff
 '9' = {
@@ -157,9 +160,11 @@
 	}
 #Snow albedo
 '32' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 32 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
 	}
 #Ice temperature layer 1
 '35' = {
@@ -211,15 +216,21 @@
 	}
 #Snow evaporation
 '44' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 44 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 197 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Snowmelt
 '45' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 2 ;
-	 parameterNumber = 45 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 203 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Solar duration
 '46' = {
@@ -233,12 +244,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 48 ;
 	}
-#Large-scale precipitation fraction
-'50' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 50 ;
-	}
 #Maximum temperature at 2 metres in the last 24 hours
 '51' = {
 	 discipline = 0 ;
@@ -281,18 +286,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 56 ;
 	}
-#Downward UV radiation at the surface
-'57' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 57 ;
-	}
-#Photosynthetically active radiation at the surface
-'58' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 58 ;
-	}
 #Observation count
 '62' = {
 	 discipline = 192 ;
@@ -674,9 +667,12 @@
 	}
 #Large-scale precipitation
 '142' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 142 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 196 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Convective precipitation
 '143' = {
@@ -687,9 +683,12 @@
 	}
 #Snowfall
 '144' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 144 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 198 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Charnock
 '148' = {
@@ -734,12 +733,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 158 ;
 	}
-#Boundary layer height
-'159' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 159 ;
-	}
 #Standard deviation of orography
 '160' = {
 	 discipline = 192 ;
@@ -766,9 +759,12 @@
 	}
 #Total cloud cover
 '164' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 164 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
 	}
 #Soil temperature level 2
 '170' = {
@@ -790,9 +786,12 @@
 	}
 #Evaporation
 '182' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 182 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 199 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Soil temperature level 3
 '183' = {
@@ -814,21 +813,24 @@
 	}
 #Low cloud cover
 '186' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 186 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 193 ;
 	}
 #Medium cloud cover
 '187' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 187 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 194 ;
 	}
 #High cloud cover
 '188' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 188 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 195 ;
 	}
 #East-West component of sub-gridscale orographic variance
 '190' = {
@@ -854,24 +856,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 193 ;
 	}
-#Eastward gravity wave surface stress
-'195' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 195 ;
-	}
-#Northward gravity wave surface stress
-'196' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 196 ;
-	}
-#Gravity wave dissipation
-'197' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 197 ;
-	}
 #Skin reservoir content
 '198' = {
 	 discipline = 192 ;
@@ -910,24 +894,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 206 ;
 	}
-#Top net solar radiation, clear sky
-'208' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 208 ;
-	}
-#Top net thermal radiation, clear sky
-'209' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 209 ;
-	}
-#TOA incident solar radiation
-'212' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 212 ;
-	}
 #Vertically integrated moisture divergence
 '213' = {
 	 discipline = 192 ;
@@ -1028,30 +994,6 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Instantaneous eastward turbulent surface stress
-'229' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 229 ;
-	}
-#Instantaneous northward turbulent surface stress
-'230' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 230 ;
-	}
-#Instantaneous surface sensible heat flux
-'231' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 231 ;
-	}
-#Instantaneous moisture flux
-'232' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 232 ;
-	}
 #Apparent surface humidity
 '233' = {
 	 discipline = 192 ;
@@ -5128,6 +5070,432 @@
 	 parameterCategory = 213 ;
 	 parameterNumber = 150 ;
 	}
+#Random pattern 51 for SPP scheme
+'213151' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 151 ;
+	}
+#Random pattern 52 for SPP scheme
+'213152' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 152 ;
+	}
+#Random pattern 53 for SPP scheme
+'213153' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 153 ;
+	}
+#Random pattern 54 for SPP scheme
+'213154' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 154 ;
+	}
+#Random pattern 55 for SPP scheme
+'213155' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 155 ;
+	}
+#Random pattern 56 for SPP scheme
+'213156' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 156 ;
+	}
+#Random pattern 57 for SPP scheme
+'213157' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 157 ;
+	}
+#Random pattern 58 for SPP scheme
+'213158' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 158 ;
+	}
+#Random pattern 59 for SPP scheme
+'213159' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 159 ;
+	}
+#Random pattern 60 for SPP scheme
+'213160' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 160 ;
+	}
+#Random pattern 61 for SPP scheme
+'213161' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 161 ;
+	}
+#Random pattern 62 for SPP scheme
+'213162' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 162 ;
+	}
+#Random pattern 63 for SPP scheme
+'213163' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 163 ;
+	}
+#Random pattern 64 for SPP scheme
+'213164' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 164 ;
+	}
+#Random pattern 65 for SPP scheme
+'213165' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 165 ;
+	}
+#Random pattern 66 for SPP scheme
+'213166' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 166 ;
+	}
+#Random pattern 67 for SPP scheme
+'213167' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 167 ;
+	}
+#Random pattern 68 for SPP scheme
+'213168' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 168 ;
+	}
+#Random pattern 69 for SPP scheme
+'213169' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 169 ;
+	}
+#Random pattern 70 for SPP scheme
+'213170' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 170 ;
+	}
+#Random pattern 71 for SPP scheme
+'213171' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 171 ;
+	}
+#Random pattern 72 for SPP scheme
+'213172' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 172 ;
+	}
+#Random pattern 73 for SPP scheme
+'213173' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 173 ;
+	}
+#Random pattern 74 for SPP scheme
+'213174' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 174 ;
+	}
+#Random pattern 75 for SPP scheme
+'213175' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 175 ;
+	}
+#Random pattern 76 for SPP scheme
+'213176' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 176 ;
+	}
+#Random pattern 77 for SPP scheme
+'213177' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 177 ;
+	}
+#Random pattern 78 for SPP scheme
+'213178' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 178 ;
+	}
+#Random pattern 79 for SPP scheme
+'213179' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 179 ;
+	}
+#Random pattern 80 for SPP scheme
+'213180' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 180 ;
+	}
+#Random pattern 81 for SPP scheme
+'213181' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 181 ;
+	}
+#Random pattern 82 for SPP scheme
+'213182' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 182 ;
+	}
+#Random pattern 83 for SPP scheme
+'213183' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 183 ;
+	}
+#Random pattern 84 for SPP scheme
+'213184' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 184 ;
+	}
+#Random pattern 85 for SPP scheme
+'213185' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 185 ;
+	}
+#Random pattern 86 for SPP scheme
+'213186' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 186 ;
+	}
+#Random pattern 87 for SPP scheme
+'213187' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 187 ;
+	}
+#Random pattern 88 for SPP scheme
+'213188' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 188 ;
+	}
+#Random pattern 89 for SPP scheme
+'213189' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 189 ;
+	}
+#Random pattern 90 for SPP scheme
+'213190' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 190 ;
+	}
+#Random pattern 91 for SPP scheme
+'213191' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 191 ;
+	}
+#Random pattern 92 for SPP scheme
+'213192' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 192 ;
+	}
+#Random pattern 93 for SPP scheme
+'213193' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 193 ;
+	}
+#Random pattern 94 for SPP scheme
+'213194' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 194 ;
+	}
+#Random pattern 95 for SPP scheme
+'213195' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 195 ;
+	}
+#Random pattern 96 for SPP scheme
+'213196' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 196 ;
+	}
+#Random pattern 97 for SPP scheme
+'213197' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 197 ;
+	}
+#Random pattern 98 for SPP scheme
+'213198' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 198 ;
+	}
+#Random pattern 99 for SPP scheme
+'213199' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 199 ;
+	}
+#Random pattern 100 for SPP scheme
+'213200' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 200 ;
+	}
+#Random pattern 101 for SPP scheme
+'213201' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 201 ;
+	}
+#Random pattern 102 for SPP scheme
+'213202' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 202 ;
+	}
+#Random pattern 103 for SPP scheme
+'213203' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 203 ;
+	}
+#Random pattern 104 for SPP scheme
+'213204' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 204 ;
+	}
+#Random pattern 105 for SPP scheme
+'213205' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 205 ;
+	}
+#Random pattern 106 for SPP scheme
+'213206' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 206 ;
+	}
+#Random pattern 107 for SPP scheme
+'213207' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 207 ;
+	}
+#Random pattern 108 for SPP scheme
+'213208' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 208 ;
+	}
+#Random pattern 109 for SPP scheme
+'213209' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 209 ;
+	}
+#Random pattern 110 for SPP scheme
+'213210' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 210 ;
+	}
+#Random pattern 111 for SPP scheme
+'213211' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 211 ;
+	}
+#Random pattern 112 for SPP scheme
+'213212' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 212 ;
+	}
+#Random pattern 113 for SPP scheme
+'213213' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 213 ;
+	}
+#Random pattern 114 for SPP scheme
+'213214' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 214 ;
+	}
+#Random pattern 115 for SPP scheme
+'213215' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 215 ;
+	}
+#Random pattern 116 for SPP scheme
+'213216' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 216 ;
+	}
+#Random pattern 117 for SPP scheme
+'213217' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 217 ;
+	}
+#Random pattern 118 for SPP scheme
+'213218' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 218 ;
+	}
+#Random pattern 119 for SPP scheme
+'213219' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 219 ;
+	}
+#Random pattern 120 for SPP scheme
+'213220' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 220 ;
+	}
+#Random pattern 121 for SPP scheme
+'213221' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 221 ;
+	}
 #Cosine of solar zenith angle
 '214001' = {
 	 discipline = 192 ;
@@ -13541,18 +13909,6 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 196 ;
 	}
-#Total column rain water
-'228089' = {
-	 discipline = 192 ;
-	 parameterCategory = 228 ;
-	 parameterNumber = 89 ;
-	}
-#Total column snow water
-'228090' = {
-	 discipline = 192 ;
-	 parameterCategory = 228 ;
-	 parameterNumber = 90 ;
-	}
 #Canopy cover fraction
 '228091' = {
 	 discipline = 192 ;
@@ -13571,12 +13927,6 @@
 	 parameterCategory = 228 ;
 	 parameterNumber = 93 ;
 	}
-#Ice temperature
-'228094' = {
-	 discipline = 192 ;
-	 parameterCategory = 228 ;
-	 parameterNumber = 94 ;
-	}
 #Evaporation from the top of canopy
 '228100' = {
 	 discipline = 192 ;
@@ -13688,9 +14038,12 @@
 	}
 #Potential evaporation
 '228251' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 228 ;
+	 discipline = 0 ;
-	 parameterNumber = 251 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 200 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Irrigation
 '228252' = {
@@ -17509,18 +17862,6 @@
 	 parameterCategory = 162 ;
 	 parameterNumber = 70 ;
 	}
-#Vertical integral of eastward water vapour flux
-'162071' = {
-	 discipline = 192 ;
-	 parameterCategory = 162 ;
-	 parameterNumber = 71 ;
-	}
-#Vertical integral of northward water vapour flux
-'162072' = {
-	 discipline = 192 ;
-	 parameterCategory = 162 ;
-	 parameterNumber = 72 ;
-	}
 #Vertical integral of eastward geopotential flux
 '162073' = {
 	 discipline = 192 ;
@@ -21859,12 +22200,6 @@
 	 parameterCategory = 220 ;
 	 parameterNumber = 228 ;
 	}
-#Friction velocity
-'228003' = {
-	 discipline = 192 ;
-	 parameterCategory = 228 ;
-	 parameterNumber = 3 ;
-	}
 #Mean temperature at 2 metres
 '228004' = {
 	 discipline = 192 ;

definitions/grib2/localConcepts/ecmf/paramId.legacy.def

@@ -400,3 +400,195 @@
  parameterCategory = 228 ;
  parameterNumber = 60 ;
 }
+#Eastward gravity wave surface stress
+'195' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 195 ;
+}
+#Friction velocity
+'228003' = {
+ discipline = 192 ;
+ parameterCategory = 228 ;
+ parameterNumber = 3 ;
+}
+#Instantaneous eastward turbulent surface stress
+'229' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 229 ;
+}
+#Instantaneous northward turbulent surface stress
+'230' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 230 ;
+}
+#Instantaneous surface sensible heat flux
+'231' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 231 ;
+}
+#Instantaneous moisture flux
+'232' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 232 ;
+}
+#Large-scale precipitation
+'142' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 142 ;
+}
+#Large-scale precipitation fraction
+'50' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 50 ;
+}
+#Northward gravity wave surface stress
+'196' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 196 ;
+}
+#Snow evaporation
+'44' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 44 ;
+}
+#Snowfall
+'144' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 144 ;
+}
+#Surface runoff
+'8' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 8 ;
+}
+#TOA incident solar radiation
+'212' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 212 ;
+}
+#Top net thermal radiation, clear sky
+'209' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 209 ;
+}
+#Top net solar radiation, clear sky
+'208' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 208 ;
+}
+#Total cloud cover
+'164' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 164 ;
+}
+#Total column rain water
+'228089' = {
+ discipline = 192 ;
+ parameterCategory = 228 ;
+ parameterNumber = 89 ;
+}
+#Total column snow water
+'228090' = {
+ discipline = 192 ;
+ parameterCategory = 228 ;
+ parameterNumber = 90 ;
+}
+#Vertical integral of eastward water vapour flux
+'162071' = {
+ discipline = 192 ;
+ parameterCategory = 162 ;
+ parameterNumber = 71 ;
+}
+#Vertical integral of northward water vapour flux
+'162072' = {
+ discipline = 192 ;
+ parameterCategory = 162 ;
+ parameterNumber = 72 ;
+}
+#Snow albedo
+'32' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 32 ;
+}
+#Ice temperature
+'228094' = {
+ discipline = 192 ;
+ parameterCategory = 228 ;
+ parameterNumber = 94 ;
+}
+#Snowmelt
+'45' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 45 ;
+}
+#Downward UV radiation at the surface
+'57' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 57 ;
+}
+#Photosynthetically active radiation at the surface
+'58' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 58 ;
+}
+#Boundary layer height
+'159' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 159 ;
+}
+#Evaporation
+'182' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 182 ;
+}
+#Low cloud cover
+'186' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 186 ;
+}
+#Medium cloud cover
+'187' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 187 ;
+}
+#High cloud cover
+'188' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 188 ;
+}
+#Gravity wave dissipation
+'197' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 197 ;
+}
+#Potential evaporation
+'228251' = {
+ discipline = 192 ;
+ parameterCategory = 228 ;
+ parameterNumber = 251 ;
+}

definitions/grib2/localConcepts/ecmf/shortName.def

@@ -25,9 +25,12 @@
 	}
 #Surface runoff
 'sro' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 2 ;
-	 parameterNumber = 8 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 202 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Sub-surface runoff
 'ssro' = {
@@ -157,9 +160,11 @@
 	}
 #Snow albedo
 'asn' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 32 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
 	}
 #Ice temperature layer 1
 'istl1' = {
@@ -211,15 +216,21 @@
 	}
 #Snow evaporation
 'es' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 44 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 197 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Snowmelt
 'smlt' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 2 ;
-	 parameterNumber = 45 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 203 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Solar duration
 'sdur' = {
@@ -233,12 +244,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 48 ;
 	}
-#Large-scale precipitation fraction
-'lspf' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 50 ;
-	}
 #Maximum temperature at 2 metres in the last 24 hours
 'mx2t24' = {
 	 discipline = 0 ;
@@ -281,18 +286,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 56 ;
 	}
-#Downward UV radiation at the surface
-'uvb' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 57 ;
-	}
-#Photosynthetically active radiation at the surface
-'par' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 58 ;
-	}
 #Observation count
 'obct' = {
 	 discipline = 192 ;
@@ -674,9 +667,12 @@
 	}
 #Large-scale precipitation
 'lsp' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 142 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 196 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Convective precipitation
 'cp' = {
@@ -687,9 +683,12 @@
 	}
 #Snowfall
 'sf' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 144 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 198 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Charnock
 'chnk' = {
@@ -734,12 +733,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 158 ;
 	}
-#Boundary layer height
-'blh' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 159 ;
-	}
 #Standard deviation of orography
 'sdor' = {
 	 discipline = 192 ;
@@ -766,9 +759,12 @@
 	}
 #Total cloud cover
 'tcc' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 164 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
 	}
 #Soil temperature level 2
 'stl2' = {
@@ -790,9 +786,12 @@
 	}
 #Evaporation
 'e' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 182 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 199 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Soil temperature level 3
 'stl3' = {
@@ -814,21 +813,24 @@
 	}
 #Low cloud cover
 'lcc' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 186 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 193 ;
 	}
 #Medium cloud cover
 'mcc' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 187 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 194 ;
 	}
 #High cloud cover
 'hcc' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 188 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 195 ;
 	}
 #East-West component of sub-gridscale orographic variance
 'ewov' = {
@@ -854,24 +856,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 193 ;
 	}
-#Eastward gravity wave surface stress
-'lgws' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 195 ;
-	}
-#Northward gravity wave surface stress
-'mgws' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 196 ;
-	}
-#Gravity wave dissipation
-'gwd' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 197 ;
-	}
 #Skin reservoir content
 'src' = {
 	 discipline = 192 ;
@@ -910,24 +894,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 206 ;
 	}
-#Top net solar radiation, clear sky
-'tsrc' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 208 ;
-	}
-#Top net thermal radiation, clear sky
-'ttrc' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 209 ;
-	}
-#TOA incident solar radiation
-'tisr' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 212 ;
-	}
 #Vertically integrated moisture divergence
 'vimd' = {
 	 discipline = 192 ;
@@ -1028,30 +994,6 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Instantaneous eastward turbulent surface stress
-'iews' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 229 ;
-	}
-#Instantaneous northward turbulent surface stress
-'inss' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 230 ;
-	}
-#Instantaneous surface sensible heat flux
-'ishf' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 231 ;
-	}
-#Instantaneous moisture flux
-'ie' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 232 ;
-	}
 #Apparent surface humidity
 'asq' = {
 	 discipline = 192 ;
@@ -5128,6 +5070,432 @@
 	 parameterCategory = 213 ;
 	 parameterNumber = 150 ;
 	}
+#Random pattern 51 for SPP scheme
+'spp51' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 151 ;
+	}
+#Random pattern 52 for SPP scheme
+'spp52' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 152 ;
+	}
+#Random pattern 53 for SPP scheme
+'spp53' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 153 ;
+	}
+#Random pattern 54 for SPP scheme
+'spp54' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 154 ;
+	}
+#Random pattern 55 for SPP scheme
+'spp55' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 155 ;
+	}
+#Random pattern 56 for SPP scheme
+'spp56' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 156 ;
+	}
+#Random pattern 57 for SPP scheme
+'spp57' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 157 ;
+	}
+#Random pattern 58 for SPP scheme
+'spp58' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 158 ;
+	}
+#Random pattern 59 for SPP scheme
+'spp59' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 159 ;
+	}
+#Random pattern 60 for SPP scheme
+'spp60' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 160 ;
+	}
+#Random pattern 61 for SPP scheme
+'spp61' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 161 ;
+	}
+#Random pattern 62 for SPP scheme
+'spp62' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 162 ;
+	}
+#Random pattern 63 for SPP scheme
+'spp63' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 163 ;
+	}
+#Random pattern 64 for SPP scheme
+'spp64' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 164 ;
+	}
+#Random pattern 65 for SPP scheme
+'spp65' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 165 ;
+	}
+#Random pattern 66 for SPP scheme
+'spp66' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 166 ;
+	}
+#Random pattern 67 for SPP scheme
+'spp67' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 167 ;
+	}
+#Random pattern 68 for SPP scheme
+'spp68' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 168 ;
+	}
+#Random pattern 69 for SPP scheme
+'spp69' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 169 ;
+	}
+#Random pattern 70 for SPP scheme
+'spp70' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 170 ;
+	}
+#Random pattern 71 for SPP scheme
+'spp71' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 171 ;
+	}
+#Random pattern 72 for SPP scheme
+'spp72' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 172 ;
+	}
+#Random pattern 73 for SPP scheme
+'spp73' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 173 ;
+	}
+#Random pattern 74 for SPP scheme
+'spp74' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 174 ;
+	}
+#Random pattern 75 for SPP scheme
+'spp75' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 175 ;
+	}
+#Random pattern 76 for SPP scheme
+'spp76' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 176 ;
+	}
+#Random pattern 77 for SPP scheme
+'spp77' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 177 ;
+	}
+#Random pattern 78 for SPP scheme
+'spp78' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 178 ;
+	}
+#Random pattern 79 for SPP scheme
+'spp79' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 179 ;
+	}
+#Random pattern 80 for SPP scheme
+'spp80' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 180 ;
+	}
+#Random pattern 81 for SPP scheme
+'spp81' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 181 ;
+	}
+#Random pattern 82 for SPP scheme
+'spp82' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 182 ;
+	}
+#Random pattern 83 for SPP scheme
+'spp83' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 183 ;
+	}
+#Random pattern 84 for SPP scheme
+'spp84' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 184 ;
+	}
+#Random pattern 85 for SPP scheme
+'spp85' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 185 ;
+	}
+#Random pattern 86 for SPP scheme
+'spp86' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 186 ;
+	}
+#Random pattern 87 for SPP scheme
+'spp87' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 187 ;
+	}
+#Random pattern 88 for SPP scheme
+'spp88' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 188 ;
+	}
+#Random pattern 89 for SPP scheme
+'spp89' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 189 ;
+	}
+#Random pattern 90 for SPP scheme
+'spp90' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 190 ;
+	}
+#Random pattern 91 for SPP scheme
+'spp91' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 191 ;
+	}
+#Random pattern 92 for SPP scheme
+'spp92' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 192 ;
+	}
+#Random pattern 93 for SPP scheme
+'spp93' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 193 ;
+	}
+#Random pattern 94 for SPP scheme
+'spp94' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 194 ;
+	}
+#Random pattern 95 for SPP scheme
+'spp95' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 195 ;
+	}
+#Random pattern 96 for SPP scheme
+'spp96' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 196 ;
+	}
+#Random pattern 97 for SPP scheme
+'spp97' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 197 ;
+	}
+#Random pattern 98 for SPP scheme
+'spp98' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 198 ;
+	}
+#Random pattern 99 for SPP scheme
+'spp99' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 199 ;
+	}
+#Random pattern 100 for SPP scheme
+'spp100' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 200 ;
+	}
+#Random pattern 101 for SPP scheme
+'spp101' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 201 ;
+	}
+#Random pattern 102 for SPP scheme
+'spp102' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 202 ;
+	}
+#Random pattern 103 for SPP scheme
+'spp103' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 203 ;
+	}
+#Random pattern 104 for SPP scheme
+'spp104' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 204 ;
+	}
+#Random pattern 105 for SPP scheme
+'spp105' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 205 ;
+	}
+#Random pattern 106 for SPP scheme
+'spp106' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 206 ;
+	}
+#Random pattern 107 for SPP scheme
+'spp107' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 207 ;
+	}
+#Random pattern 108 for SPP scheme
+'spp108' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 208 ;
+	}
+#Random pattern 109 for SPP scheme
+'spp109' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 209 ;
+	}
+#Random pattern 110 for SPP scheme
+'spp110' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 210 ;
+	}
+#Random pattern 111 for SPP scheme
+'spp111' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 211 ;
+	}
+#Random pattern 112 for SPP scheme
+'spp112' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 212 ;
+	}
+#Random pattern 113 for SPP scheme
+'spp113' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 213 ;
+	}
+#Random pattern 114 for SPP scheme
+'spp114' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 214 ;
+	}
+#Random pattern 115 for SPP scheme
+'spp115' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 215 ;
+	}
+#Random pattern 116 for SPP scheme
+'spp116' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 216 ;
+	}
+#Random pattern 117 for SPP scheme
+'spp117' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 217 ;
+	}
+#Random pattern 118 for SPP scheme
+'spp118' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 218 ;
+	}
+#Random pattern 119 for SPP scheme
+'spp119' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 219 ;
+	}
+#Random pattern 120 for SPP scheme
+'spp120' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 220 ;
+	}
+#Random pattern 121 for SPP scheme
+'spp121' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 221 ;
+	}
 #Cosine of solar zenith angle
 'uvcossza' = {
 	 discipline = 192 ;
@@ -13541,18 +13909,6 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 196 ;
 	}
-#Total column rain water
-'tcrw' = {
-	 discipline = 192 ;
-	 parameterCategory = 228 ;
-	 parameterNumber = 89 ;
-	}
-#Total column snow water
-'tcsw' = {
-	 discipline = 192 ;
-	 parameterCategory = 228 ;
-	 parameterNumber = 90 ;
-	}
 #Canopy cover fraction
 'ccf' = {
 	 discipline = 192 ;
@@ -13571,12 +13927,6 @@
 	 parameterCategory = 228 ;
 	 parameterNumber = 93 ;
 	}
-#Ice temperature
-'ist' = {
-	 discipline = 192 ;
-	 parameterCategory = 228 ;
-	 parameterNumber = 94 ;
-	}
 #Evaporation from the top of canopy
 'evatc' = {
 	 discipline = 192 ;
@@ -13688,9 +14038,12 @@
 	}
 #Potential evaporation
 'pev' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 228 ;
+	 discipline = 0 ;
-	 parameterNumber = 251 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 200 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Irrigation
 'irr' = {
@@ -17509,18 +17862,6 @@
 	 parameterCategory = 162 ;
 	 parameterNumber = 70 ;
 	}
-#Vertical integral of eastward water vapour flux
-'viwve' = {
-	 discipline = 192 ;
-	 parameterCategory = 162 ;
-	 parameterNumber = 71 ;
-	}
-#Vertical integral of northward water vapour flux
-'viwvn' = {
-	 discipline = 192 ;
-	 parameterCategory = 162 ;
-	 parameterNumber = 72 ;
-	}
 #Vertical integral of eastward geopotential flux
 'vige' = {
 	 discipline = 192 ;
@@ -21859,12 +22200,6 @@
 	 parameterCategory = 220 ;
 	 parameterNumber = 228 ;
 	}
-#Friction velocity
-'zust' = {
-	 discipline = 192 ;
-	 parameterCategory = 228 ;
-	 parameterNumber = 3 ;
-	}
 #Mean temperature at 2 metres
 'mean2t' = {
 	 discipline = 192 ;

definitions/grib2/localConcepts/ecmf/shortName.legacy.def

@@ -400,3 +400,195 @@
  parameterCategory = 228 ;
  parameterNumber = 60 ;
 }
+#Eastward gravity wave surface stress
+'lgws' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 195 ;
+}
+#Friction velocity
+'zust' = {
+ discipline = 192 ;
+ parameterCategory = 228 ;
+ parameterNumber = 3 ;
+}
+#Instantaneous eastward turbulent surface stress
+'iews' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 229 ;
+}
+#Instantaneous northward turbulent surface stress
+'inss' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 230 ;
+}
+#Instantaneous surface sensible heat flux
+'ishf' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 231 ;
+}
+#Instantaneous moisture flux
+'ie' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 232 ;
+}
+#Large-scale precipitation
+'lsp' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 142 ;
+}
+#Large-scale precipitation fraction
+'lspf' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 50 ;
+}
+#Northward gravity wave surface stress
+'mgws' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 196 ;
+}
+#Snow evaporation
+'es' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 44 ;
+}
+#Snowfall
+'sf' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 144 ;
+}
+#Surface runoff
+'sro' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 8 ;
+}
+#TOA incident solar radiation
+'tisr' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 212 ;
+}
+#Top net thermal radiation, clear sky
+'ttrc' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 209 ;
+}
+#Top net solar radiation, clear sky
+'tsrc' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 208 ;
+}
+#Total cloud cover
+'tcc' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 164 ;
+}
+#Total column rain water
+'tcrw' = {
+ discipline = 192 ;
+ parameterCategory = 228 ;
+ parameterNumber = 89 ;
+}
+#Total column snow water
+'tcsw' = {
+ discipline = 192 ;
+ parameterCategory = 228 ;
+ parameterNumber = 90 ;
+}
+#Vertical integral of eastward water vapour flux
+'viwve' = {
+ discipline = 192 ;
+ parameterCategory = 162 ;
+ parameterNumber = 71 ;
+}
+#Vertical integral of northward water vapour flux
+'viwvn' = {
+ discipline = 192 ;
+ parameterCategory = 162 ;
+ parameterNumber = 72 ;
+}
+#Snow albedo
+'asn' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 32 ;
+}
+#Ice temperature
+'ist' = {
+ discipline = 192 ;
+ parameterCategory = 228 ;
+ parameterNumber = 94 ;
+}
+#Snowmelt
+'smlt' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 45 ;
+}
+#Downward UV radiation at the surface
+'uvb' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 57 ;
+}
+#Photosynthetically active radiation at the surface
+'par' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 58 ;
+}
+#Boundary layer height
+'blh' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 159 ;
+}
+#Evaporation
+'e' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 182 ;
+}
+#Low cloud cover
+'lcc' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 186 ;
+}
+#Medium cloud cover
+'mcc' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 187 ;
+}
+#High cloud cover
+'hcc' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 188 ;
+}
+#Gravity wave dissipation
+'gwd' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 197 ;
+}
+#Potential evaporation
+'pev' = {
+ discipline = 192 ;
+ parameterCategory = 228 ;
+ parameterNumber = 251 ;
+}

definitions/grib2/localConcepts/ecmf/units.def

@@ -25,9 +25,12 @@
 	}
 #Surface runoff
 'm' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 2 ;
-	 parameterNumber = 8 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 202 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Sub-surface runoff
 'm' = {
@@ -157,9 +160,11 @@
 	}
 #Snow albedo
 '(0 - 1)' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 32 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
 	}
 #Ice temperature layer 1
 'K' = {
@@ -211,15 +216,21 @@
 	}
 #Snow evaporation
 'm of water equivalent' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 44 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 197 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Snowmelt
 'm of water equivalent' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 2 ;
-	 parameterNumber = 45 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 203 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Solar duration
 's' = {
@@ -233,12 +244,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 48 ;
 	}
-#Large-scale precipitation fraction
-'s' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 50 ;
-	}
 #Maximum temperature at 2 metres in the last 24 hours
 'K' = {
 	 discipline = 0 ;
@@ -281,18 +286,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 56 ;
 	}
-#Downward UV radiation at the surface
-'J m**-2' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 57 ;
-	}
-#Photosynthetically active radiation at the surface
-'J m**-2' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 58 ;
-	}
 #Observation count
 '~' = {
 	 discipline = 192 ;
@@ -674,9 +667,12 @@
 	}
 #Large-scale precipitation
 'm' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 142 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 196 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Convective precipitation
 'm' = {
@@ -687,9 +683,12 @@
 	}
 #Snowfall
 'm of water equivalent' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 144 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 198 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Charnock
 '~' = {
@@ -734,12 +733,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 158 ;
 	}
-#Boundary layer height
-'m' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 159 ;
-	}
 #Standard deviation of orography
 'm' = {
 	 discipline = 192 ;
@@ -766,9 +759,12 @@
 	}
 #Total cloud cover
 '(0 - 1)' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 164 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 192 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
 	}
 #Soil temperature level 2
 'K' = {
@@ -790,9 +786,12 @@
 	}
 #Evaporation
 'm of water equivalent' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 182 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 199 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Soil temperature level 3
 'K' = {
@@ -814,21 +813,24 @@
 	}
 #Low cloud cover
 '(0 - 1)' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 186 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 193 ;
 	}
 #Medium cloud cover
 '(0 - 1)' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 187 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 194 ;
 	}
 #High cloud cover
 '(0 - 1)' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 128 ;
+	 discipline = 0 ;
-	 parameterNumber = 188 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 195 ;
 	}
 #East-West component of sub-gridscale orographic variance
 'm**2' = {
@@ -854,24 +856,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 193 ;
 	}
-#Eastward gravity wave surface stress
-'N m**-2 s' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 195 ;
-	}
-#Northward gravity wave surface stress
-'N m**-2 s' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 196 ;
-	}
-#Gravity wave dissipation
-'J m**-2' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 197 ;
-	}
 #Skin reservoir content
 'm of water equivalent' = {
 	 discipline = 192 ;
@@ -910,24 +894,6 @@
 	 parameterCategory = 128 ;
 	 parameterNumber = 206 ;
 	}
-#Top net solar radiation, clear sky
-'J m**-2' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 208 ;
-	}
-#Top net thermal radiation, clear sky
-'J m**-2' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 209 ;
-	}
-#TOA incident solar radiation
-'J m**-2' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 212 ;
-	}
 #Vertically integrated moisture divergence
 'kg m**-2' = {
 	 discipline = 192 ;
@@ -1028,30 +994,6 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Instantaneous eastward turbulent surface stress
-'N m**-2' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 229 ;
-	}
-#Instantaneous northward turbulent surface stress
-'N m**-2' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 230 ;
-	}
-#Instantaneous surface sensible heat flux
-'W m**-2' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 231 ;
-	}
-#Instantaneous moisture flux
-'kg m**-2 s**-1' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 232 ;
-	}
 #Apparent surface humidity
 'kg kg**-1' = {
 	 discipline = 192 ;
@@ -5128,6 +5070,432 @@
 	 parameterCategory = 213 ;
 	 parameterNumber = 150 ;
 	}
+#Random pattern 51 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 151 ;
+	}
+#Random pattern 52 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 152 ;
+	}
+#Random pattern 53 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 153 ;
+	}
+#Random pattern 54 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 154 ;
+	}
+#Random pattern 55 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 155 ;
+	}
+#Random pattern 56 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 156 ;
+	}
+#Random pattern 57 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 157 ;
+	}
+#Random pattern 58 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 158 ;
+	}
+#Random pattern 59 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 159 ;
+	}
+#Random pattern 60 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 160 ;
+	}
+#Random pattern 61 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 161 ;
+	}
+#Random pattern 62 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 162 ;
+	}
+#Random pattern 63 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 163 ;
+	}
+#Random pattern 64 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 164 ;
+	}
+#Random pattern 65 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 165 ;
+	}
+#Random pattern 66 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 166 ;
+	}
+#Random pattern 67 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 167 ;
+	}
+#Random pattern 68 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 168 ;
+	}
+#Random pattern 69 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 169 ;
+	}
+#Random pattern 70 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 170 ;
+	}
+#Random pattern 71 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 171 ;
+	}
+#Random pattern 72 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 172 ;
+	}
+#Random pattern 73 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 173 ;
+	}
+#Random pattern 74 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 174 ;
+	}
+#Random pattern 75 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 175 ;
+	}
+#Random pattern 76 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 176 ;
+	}
+#Random pattern 77 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 177 ;
+	}
+#Random pattern 78 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 178 ;
+	}
+#Random pattern 79 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 179 ;
+	}
+#Random pattern 80 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 180 ;
+	}
+#Random pattern 81 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 181 ;
+	}
+#Random pattern 82 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 182 ;
+	}
+#Random pattern 83 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 183 ;
+	}
+#Random pattern 84 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 184 ;
+	}
+#Random pattern 85 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 185 ;
+	}
+#Random pattern 86 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 186 ;
+	}
+#Random pattern 87 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 187 ;
+	}
+#Random pattern 88 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 188 ;
+	}
+#Random pattern 89 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 189 ;
+	}
+#Random pattern 90 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 190 ;
+	}
+#Random pattern 91 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 191 ;
+	}
+#Random pattern 92 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 192 ;
+	}
+#Random pattern 93 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 193 ;
+	}
+#Random pattern 94 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 194 ;
+	}
+#Random pattern 95 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 195 ;
+	}
+#Random pattern 96 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 196 ;
+	}
+#Random pattern 97 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 197 ;
+	}
+#Random pattern 98 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 198 ;
+	}
+#Random pattern 99 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 199 ;
+	}
+#Random pattern 100 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 200 ;
+	}
+#Random pattern 101 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 201 ;
+	}
+#Random pattern 102 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 202 ;
+	}
+#Random pattern 103 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 203 ;
+	}
+#Random pattern 104 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 204 ;
+	}
+#Random pattern 105 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 205 ;
+	}
+#Random pattern 106 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 206 ;
+	}
+#Random pattern 107 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 207 ;
+	}
+#Random pattern 108 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 208 ;
+	}
+#Random pattern 109 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 209 ;
+	}
+#Random pattern 110 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 210 ;
+	}
+#Random pattern 111 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 211 ;
+	}
+#Random pattern 112 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 212 ;
+	}
+#Random pattern 113 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 213 ;
+	}
+#Random pattern 114 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 214 ;
+	}
+#Random pattern 115 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 215 ;
+	}
+#Random pattern 116 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 216 ;
+	}
+#Random pattern 117 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 217 ;
+	}
+#Random pattern 118 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 218 ;
+	}
+#Random pattern 119 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 219 ;
+	}
+#Random pattern 120 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 220 ;
+	}
+#Random pattern 121 for SPP scheme
+'dimensionless' = {
+	 discipline = 192 ;
+	 parameterCategory = 213 ;
+	 parameterNumber = 221 ;
+	}
 #Cosine of solar zenith angle
 '~' = {
 	 discipline = 192 ;
@@ -13541,18 +13909,6 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 196 ;
 	}
-#Total column rain water
-'kg m**-2' = {
-	 discipline = 192 ;
-	 parameterCategory = 228 ;
-	 parameterNumber = 89 ;
-	}
-#Total column snow water
-'kg m**-2' = {
-	 discipline = 192 ;
-	 parameterCategory = 228 ;
-	 parameterNumber = 90 ;
-	}
 #Canopy cover fraction
 '(0 - 1)' = {
 	 discipline = 192 ;
@@ -13571,12 +13927,6 @@
 	 parameterCategory = 228 ;
 	 parameterNumber = 93 ;
 	}
-#Ice temperature
-'K' = {
-	 discipline = 192 ;
-	 parameterCategory = 228 ;
-	 parameterNumber = 94 ;
-	}
 #Evaporation from the top of canopy
 'm of water equivalent' = {
 	 discipline = 192 ;
@@ -13688,9 +14038,12 @@
 	}
 #Potential evaporation
 'm' = {
-	 discipline = 192 ;
+	 localTablesVersion = 1 ;
-	 parameterCategory = 228 ;
+	 discipline = 0 ;
-	 parameterNumber = 251 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 200 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Irrigation
 'm' = {
@@ -17509,18 +17862,6 @@
 	 parameterCategory = 162 ;
 	 parameterNumber = 70 ;
 	}
-#Vertical integral of eastward water vapour flux
-'kg m**-1 s**-1' = {
-	 discipline = 192 ;
-	 parameterCategory = 162 ;
-	 parameterNumber = 71 ;
-	}
-#Vertical integral of northward water vapour flux
-'kg m**-1 s**-1' = {
-	 discipline = 192 ;
-	 parameterCategory = 162 ;
-	 parameterNumber = 72 ;
-	}
 #Vertical integral of eastward geopotential flux
 'W m**-1' = {
 	 discipline = 192 ;
@@ -21859,12 +22200,6 @@
 	 parameterCategory = 220 ;
 	 parameterNumber = 228 ;
 	}
-#Friction velocity
-'m s**-1' = {
-	 discipline = 192 ;
-	 parameterCategory = 228 ;
-	 parameterNumber = 3 ;
-	}
 #Mean temperature at 2 metres
 'K' = {
 	 discipline = 192 ;

definitions/grib2/localConcepts/ecmf/units.legacy.def

@@ -400,3 +400,195 @@
  parameterCategory = 228 ;
  parameterNumber = 60 ;
 }
+#Eastward gravity wave surface stress
+'N m**-2 s' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 195 ;
+}
+#Friction velocity
+'m s**-1' = {
+ discipline = 192 ;
+ parameterCategory = 228 ;
+ parameterNumber = 3 ;
+}
+#Instantaneous eastward turbulent surface stress
+'N m**-2' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 229 ;
+}
+#Instantaneous northward turbulent surface stress
+'N m**-2' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 230 ;
+}
+#Instantaneous surface sensible heat flux
+'W m**-2' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 231 ;
+}
+#Instantaneous moisture flux
+'kg m**-2 s**-1' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 232 ;
+}
+#Large-scale precipitation
+'m' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 142 ;
+}
+#Large-scale precipitation fraction
+'s' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 50 ;
+}
+#Northward gravity wave surface stress
+'N m**-2 s' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 196 ;
+}
+#Snow evaporation
+'m of water equivalent' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 44 ;
+}
+#Snowfall
+'m of water equivalent' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 144 ;
+}
+#Surface runoff
+'m' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 8 ;
+}
+#TOA incident solar radiation
+'J m**-2' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 212 ;
+}
+#Top net thermal radiation, clear sky
+'J m**-2' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 209 ;
+}
+#Top net solar radiation, clear sky
+'J m**-2' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 208 ;
+}
+#Total cloud cover
+'(0 - 1)' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 164 ;
+}
+#Total column rain water
+'kg m**-2' = {
+ discipline = 192 ;
+ parameterCategory = 228 ;
+ parameterNumber = 89 ;
+}
+#Total column snow water
+'kg m**-2' = {
+ discipline = 192 ;
+ parameterCategory = 228 ;
+ parameterNumber = 90 ;
+}
+#Vertical integral of eastward water vapour flux
+'kg m**-1 s**-1' = {
+ discipline = 192 ;
+ parameterCategory = 162 ;
+ parameterNumber = 71 ;
+}
+#Vertical integral of northward water vapour flux
+'kg m**-1 s**-1' = {
+ discipline = 192 ;
+ parameterCategory = 162 ;
+ parameterNumber = 72 ;
+}
+#Snow albedo
+'(0 - 1)' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 32 ;
+}
+#Ice temperature
+'K' = {
+ discipline = 192 ;
+ parameterCategory = 228 ;
+ parameterNumber = 94 ;
+}
+#Snowmelt
+'m of water equivalent' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 45 ;
+}
+#Downward UV radiation at the surface
+'J m**-2' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 57 ;
+}
+#Photosynthetically active radiation at the surface
+'J m**-2' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 58 ;
+}
+#Boundary layer height
+'m' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 159 ;
+}
+#Evaporation
+'m of water equivalent' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 182 ;
+}
+#Low cloud cover
+'(0 - 1)' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 186 ;
+}
+#Medium cloud cover
+'(0 - 1)' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 187 ;
+}
+#High cloud cover
+'(0 - 1)' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 188 ;
+}
+#Gravity wave dissipation
+'J m**-2' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 197 ;
+}
+#Potential evaporation
+'m' = {
+ discipline = 192 ;
+ parameterCategory = 228 ;
+ parameterNumber = 251 ;
+}

definitions/grib2/localConcepts/kwbc/name.def

@@ -161,12 +161,6 @@
 	 parameterCategory = 3 ;
 	 parameterNumber = 195 ;
 	}
-#Planetary boundary layer height
-'Planetary boundary layer height' = {
-	 discipline = 0 ;
-	 parameterCategory = 3 ;
-	 parameterNumber = 196 ;
-	}
 #5-wave geopotential height anomaly
 '5-wave geopotential height anomaly' = {
 	 discipline = 0 ;

definitions/grib2/localConcepts/kwbc/paramId.def

@@ -161,12 +161,6 @@
 	 parameterCategory = 3 ;
 	 parameterNumber = 195 ;
 	}
-#Planetary boundary layer height
-'260083' = {
-	 discipline = 0 ;
-	 parameterCategory = 3 ;
-	 parameterNumber = 196 ;
-	}
 #5-wave geopotential height anomaly
 '260084' = {
 	 discipline = 0 ;

definitions/grib2/localConcepts/kwbc/shortName.def

@@ -161,12 +161,6 @@
 	 parameterCategory = 3 ;
 	 parameterNumber = 195 ;
 	}
-#Planetary boundary layer height
-'hpbl' = {
-	 discipline = 0 ;
-	 parameterCategory = 3 ;
-	 parameterNumber = 196 ;
-	}
 #5-wave geopotential height anomaly
 '5wava' = {
 	 discipline = 0 ;

definitions/grib2/localConcepts/kwbc/units.def

@@ -161,12 +161,6 @@
 	 parameterCategory = 3 ;
 	 parameterNumber = 195 ;
 	}
-#Planetary boundary layer height
-'m' = {
-	 discipline = 0 ;
-	 parameterCategory = 3 ;
-	 parameterNumber = 196 ;
-	}
 #5-wave geopotential height anomaly
 'gpm' = {
 	 discipline = 0 ;

definitions/grib2/localConcepts/s2s/cfName.def

@@ -4,6 +4,7 @@
 	 discipline = 10 ;
 	 parameterCategory = 2 ;
 	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
 	}
 #Sea surface practical salinity
 'sea_surface_salinity' = {

definitions/grib2/localConcepts/s2s/cfVarName.def

@@ -4,6 +4,7 @@
 	 discipline = 10 ;
 	 parameterCategory = 2 ;
 	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
 	}
 #Maximum temperature at 2 metres in the last 6 hours
 'mx2t6' = {

definitions/grib2/localConcepts/s2s/name.def

@@ -4,6 +4,7 @@
 	 discipline = 10 ;
 	 parameterCategory = 2 ;
 	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
 	}
 #Maximum temperature at 2 metres in the last 6 hours
 'Maximum temperature at 2 metres in the last 6 hours' = {

definitions/grib2/localConcepts/s2s/paramId.def

@@ -4,6 +4,7 @@
 	 discipline = 10 ;
 	 parameterCategory = 2 ;
 	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
 	}
 #Maximum temperature at 2 metres in the last 6 hours
 '121' = {

definitions/grib2/localConcepts/s2s/shortName.def

@@ -4,6 +4,7 @@
 	 discipline = 10 ;
 	 parameterCategory = 2 ;
 	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
 	}
 #Maximum temperature at 2 metres in the last 6 hours
 'mx2t6' = {

definitions/grib2/localConcepts/s2s/units.def

@@ -4,6 +4,7 @@
 	 discipline = 10 ;
 	 parameterCategory = 2 ;
 	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
 	}
 #Maximum temperature at 2 metres in the last 6 hours
 'K' = {

definitions/grib2/localConcepts/uerra/cfVarName.def

@@ -130,6 +130,8 @@
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
 	 parameterNumber = 64 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
 	}
 #2 metre relative humidity
 'r2' = {

definitions/grib2/localConcepts/uerra/name.def

@@ -130,6 +130,8 @@
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
 	 parameterNumber = 64 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
 	}
 #2 metre relative humidity
 '2 metre relative humidity' = {

definitions/grib2/localConcepts/uerra/paramId.def

@@ -130,6 +130,8 @@
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
 	 parameterNumber = 64 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
 	}
 #2 metre relative humidity
 '260242' = {

definitions/grib2/localConcepts/uerra/shortName.def

@@ -130,6 +130,8 @@
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
 	 parameterNumber = 64 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
 	}
 #2 metre relative humidity
 '2r' = {

definitions/grib2/localConcepts/uerra/units.def

@@ -130,6 +130,8 @@
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
 	 parameterNumber = 64 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
 	}
 #2 metre relative humidity
 '%' = {

definitions/grib2/name.def

@@ -136,6 +136,7 @@
 	 discipline = 10 ;
 	 parameterCategory = 2 ;
 	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
 	}
 #Snow density
 'Snow density' = {
@@ -165,6 +166,30 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
+#Large-scale precipitation fraction
+'Large-scale precipitation fraction' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 36 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Downward UV radiation at the surface
+'Downward UV radiation at the surface' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 12 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Photosynthetically active radiation at the surface
+'Photosynthetically active radiation at the surface' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 10 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
 #Specific rain water content
 'Specific rain water content' = {
 	 discipline = 0 ;
@@ -204,25 +229,40 @@
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
 	 parameterNumber = 64 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
 	}
-#Surface short-wave radiation downwards
+#Boundary layer dissipation
-'Surface short-wave radiation downwards' = {
+'Boundary layer dissipation' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 20 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Boundary layer height
+'Boundary layer height' = {
+	 discipline = 0 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 18 ;
+	}
+#Surface short-wave (solar) radiation downwards
+'Surface short-wave (solar) radiation downwards' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
 	 parameterNumber = 7 ;
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface long-wave radiation downwards
+#Surface long-wave (thermal) radiation downwards
-'Surface long-wave radiation downwards' = {
+'Surface long-wave (thermal) radiation downwards' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
 	 parameterNumber = 3 ;
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
-'Top net short-wave radiation' = {
+'Top net short-wave (solar) radiation' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
 	 parameterNumber = 1 ;
@@ -234,12 +274,39 @@
 	 discipline = 0 ;
 	 parameterCategory = 2 ;
 	 parameterNumber = 38 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Northward turbulent surface stress
 'Northward turbulent surface stress' = {
 	 discipline = 0 ;
 	 parameterCategory = 2 ;
 	 parameterNumber = 37 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Eastward gravity wave surface stress
+'Eastward gravity wave surface stress' = {
+	 discipline = 0 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 16 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Northward gravity wave surface stress
+'Northward gravity wave surface stress' = {
+	 discipline = 0 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 17 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Gravity wave dissipation
+'Gravity wave dissipation' = {
+	 discipline = 0 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 23 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Ozone mass mixing ratio
 'Ozone mass mixing ratio' = {
@@ -247,22 +314,74 @@
 	 parameterCategory = 14 ;
 	 parameterNumber = 1 ;
 	}
-#Surface net short-wave radiation, clear sky
+#Top net solar radiation, clear sky
-'Surface net short-wave radiation, clear sky' = {
+'Top net solar radiation, clear sky' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 11 ;
+	 typeOfFirstFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Top net thermal radiation, clear sky
+'Top net thermal radiation, clear sky' = {
+	 discipline = 0 ;
+	 parameterCategory = 5 ;
+	 parameterNumber = 6 ;
+	 typeOfFirstFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Surface net short-wave (solar) radiation, clear sky
+'Surface net short-wave (solar) radiation, clear sky' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
 	 parameterNumber = 11 ;
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface net long-wave radiation, clear sky
+#Surface net long-wave (thermal) radiation, clear sky
-'Surface net long-wave radiation, clear sky' = {
+'Surface net long-wave (thermal) radiation, clear sky' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
 	 parameterNumber = 6 ;
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
+#TOA incident solar radiation
+'TOA incident solar radiation' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 7 ;
+	 typeOfFirstFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Instantaneous eastward turbulent surface stress
+'Instantaneous eastward turbulent surface stress' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 38 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
+#Instantaneous northward turbulent surface stress
+'Instantaneous northward turbulent surface stress' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 37 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
+#Instantaneous surface sensible heat flux
+'Instantaneous surface sensible heat flux' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 11 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
+#Instantaneous moisture flux
+'Instantaneous moisture flux' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 79 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
 #Temperature of snow layer
 'Temperature of snow layer' = {
 	 discipline = 2 ;
@@ -1875,12 +1994,6 @@
 	 parameterCategory = 19 ;
 	 parameterNumber = 19 ;
 	}
-#Fraction of stratiform precipitation cover
-'Fraction of stratiform precipitation cover' = {
-	 discipline = 0 ;
-	 parameterCategory = 6 ;
-	 parameterNumber = 36 ;
-	}
 #Fraction of convective precipitation cover
 'Fraction of convective precipitation cover' = {
 	 discipline = 0 ;
@@ -2062,6 +2175,28 @@
 	 scaledValueOfSecondFixedSurface = 10 ;
 	 scaleFactorOfSecondFixedSurface = 1 ;
 	}
+#Total column rain water
+'Total column rain water' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 45 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
+#Total column snow water
+'Total column snow water' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 46 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
+#Ice temperature
+'Ice temperature' = {
+	 discipline = 1 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 6 ;
+	}
 #Soil temperature top 20 cm
 'Soil temperature top 20 cm' = {
 	 discipline = 2 ;
@@ -2109,6 +2244,13 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 33 ;
 	}
+#Instantaneous large-scale surface precipitation fraction
+'Instantaneous large-scale surface precipitation fraction' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 36 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
 #Convective rain rate
 'Convective rain rate' = {
 	 discipline = 0 ;
@@ -2288,6 +2430,37 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 49 ;
 	}
+#Accumulated freezing rain water equivalent
+'Accumulated freezing rain water equivalent' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 67 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Runoff water equivalent
+'Runoff water equivalent' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 42 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Snow evaporation water equivalent
+'Snow evaporation water equivalent' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 148 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Total snowfall water equivalent
+'Total snowfall water equivalent' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 53 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
 #Mean temperature tendency due to short-wave radiation
 'Mean temperature tendency due to short-wave radiation' = {
 	 discipline = 0 ;
@@ -2671,12 +2844,6 @@
 	 parameterCategory = 6 ;
 	 parameterNumber = 22 ;
 	}
-#Evaporation rate
-'Evaporation rate' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 79 ;
-	}
 #Evaporation
 'Evaporation' = {
 	 discipline = 0 ;
@@ -4720,6 +4887,22 @@
 	 parameterNumber = 3 ;
 	 typeOfFirstFixedSurface = 160 ;
 	}
+#Vertical integral of eastward water vapour flux
+'Vertical integral of 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' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 151 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
 #Surface runoff
 'Surface runoff' = {
 	 discipline = 2 ;
@@ -4794,6 +4977,12 @@
 	 typeOfGeneratingProcess = 20 ;
 	 is_chemical = 1 ;
 	}
+#Friction velocity
+'Friction velocity' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 17 ;
+	}
 #Lake total depth
 'Lake total depth' = {
 	 discipline = 1 ;
@@ -5017,12 +5206,6 @@
 	 parameterCategory = 2 ;
 	 parameterNumber = 12 ;
 	}
-#Boundary layer dissipation
-'Boundary layer dissipation' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 20 ;
-	}
 #Surface sensible heat flux
 'Surface sensible heat flux' = {
 	 discipline = 0 ;
@@ -5113,24 +5296,24 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 1 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
-'Surface net short-wave radiation' = {
+'Surface net short-wave (solar) radiation' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
 	 parameterNumber = 9 ;
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
-'Surface net long-wave radiation' = {
+'Surface net long-wave (thermal) radiation' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
 	 parameterNumber = 5 ;
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
-'Top net long-wave radiation' = {
+'Top net long-wave (thermal) radiation' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
 	 parameterNumber = 5 ;
@@ -5173,12 +5356,6 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 10 ;
 	}
-#Sensible heat net flux
-'Sensible heat net flux' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 11 ;
-	}
 #Heat index
 'Heat index' = {
 	 discipline = 0 ;
@@ -5448,6 +5625,7 @@
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
 	 parameterNumber = 52 ;
+	 typeOfFirstFixedSurface = 1 ;
 	}
 #Total snowfall rate water equivalent
 'Total snowfall rate water equivalent' = {
@@ -5472,6 +5650,7 @@
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
 	 parameterNumber = 56 ;
+	 typeOfFirstFixedSurface = 1 ;
 	}
 #Total snowfall rate
 'Total snowfall rate' = {
@@ -5647,12 +5826,6 @@
 	 parameterCategory = 3 ;
 	 parameterNumber = 17 ;
 	}
-#Planetary boundary layer height
-'Planetary boundary layer height' = {
-	 discipline = 0 ;
-	 parameterCategory = 3 ;
-	 parameterNumber = 18 ;
-	}
 #5-wave geopotential height anomaly
 '5-wave geopotential height anomaly' = {
 	 discipline = 0 ;

definitions/grib2/paramId.def

@@ -136,6 +136,7 @@
 	 discipline = 10 ;
 	 parameterCategory = 2 ;
 	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
 	}
 #Snow density
 '33' = {
@@ -165,6 +166,30 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
+#Large-scale precipitation fraction
+'50' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 36 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Downward UV radiation at the surface
+'57' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 12 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Photosynthetically active radiation at the surface
+'58' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 10 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
 #Specific rain water content
 '75' = {
 	 discipline = 0 ;
@@ -204,8 +229,23 @@
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
 	 parameterNumber = 64 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
 	}
-#Surface short-wave radiation downwards
+#Boundary layer dissipation
+'145' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 20 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Boundary layer height
+'159' = {
+	 discipline = 0 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 18 ;
+	}
+#Surface short-wave (solar) radiation downwards
 '169' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -213,7 +253,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface long-wave radiation downwards
+#Surface long-wave (thermal) radiation downwards
 '175' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
@@ -221,7 +261,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 '178' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -234,12 +274,39 @@
 	 discipline = 0 ;
 	 parameterCategory = 2 ;
 	 parameterNumber = 38 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Northward turbulent surface stress
 '181' = {
 	 discipline = 0 ;
 	 parameterCategory = 2 ;
 	 parameterNumber = 37 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Eastward gravity wave surface stress
+'195' = {
+	 discipline = 0 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 16 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Northward gravity wave surface stress
+'196' = {
+	 discipline = 0 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 17 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Gravity wave dissipation
+'197' = {
+	 discipline = 0 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 23 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Ozone mass mixing ratio
 '203' = {
@@ -247,7 +314,23 @@
 	 parameterCategory = 14 ;
 	 parameterNumber = 1 ;
 	}
-#Surface net short-wave radiation, clear sky
+#Top net solar radiation, clear sky
+'208' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 11 ;
+	 typeOfFirstFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Top net thermal radiation, clear sky
+'209' = {
+	 discipline = 0 ;
+	 parameterCategory = 5 ;
+	 parameterNumber = 6 ;
+	 typeOfFirstFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Surface net short-wave (solar) radiation, clear sky
 '210' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -255,7 +338,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface net long-wave radiation, clear sky
+#Surface net long-wave (thermal) radiation, clear sky
 '211' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
@@ -263,6 +346,42 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
+#TOA incident solar radiation
+'212' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 7 ;
+	 typeOfFirstFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Instantaneous eastward turbulent surface stress
+'229' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 38 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
+#Instantaneous northward turbulent surface stress
+'230' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 37 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
+#Instantaneous surface sensible heat flux
+'231' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 11 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
+#Instantaneous moisture flux
+'232' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 79 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
 #Temperature of snow layer
 '238' = {
 	 discipline = 2 ;
@@ -1875,12 +1994,6 @@
 	 parameterCategory = 19 ;
 	 parameterNumber = 19 ;
 	}
-#Fraction of stratiform precipitation cover
-'228033' = {
-	 discipline = 0 ;
-	 parameterCategory = 6 ;
-	 parameterNumber = 36 ;
-	}
 #Fraction of convective precipitation cover
 '228034' = {
 	 discipline = 0 ;
@@ -2062,6 +2175,28 @@
 	 scaledValueOfSecondFixedSurface = 10 ;
 	 scaleFactorOfSecondFixedSurface = 1 ;
 	}
+#Total column rain water
+'228089' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 45 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
+#Total column snow water
+'228090' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 46 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
+#Ice temperature
+'228094' = {
+	 discipline = 1 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 6 ;
+	}
 #Soil temperature top 20 cm
 '228095' = {
 	 discipline = 2 ;
@@ -2109,6 +2244,13 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 33 ;
 	}
+#Instantaneous large-scale surface precipitation fraction
+'228217' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 36 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
 #Convective rain rate
 '228218' = {
 	 discipline = 0 ;
@@ -2288,6 +2430,37 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 49 ;
 	}
+#Accumulated freezing rain water equivalent
+'231001' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 67 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Runoff water equivalent
+'231002' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 42 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Snow evaporation water equivalent
+'231003' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 148 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Total snowfall water equivalent
+'231004' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 53 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
 #Mean temperature tendency due to short-wave radiation
 '235001' = {
 	 discipline = 0 ;
@@ -2671,12 +2844,6 @@
 	 parameterCategory = 6 ;
 	 parameterNumber = 22 ;
 	}
-#Evaporation rate
-'260258' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 79 ;
-	}
 #Evaporation
 '260259' = {
 	 discipline = 0 ;
@@ -4720,6 +4887,22 @@
 	 parameterNumber = 3 ;
 	 typeOfFirstFixedSurface = 160 ;
 	}
+#Vertical integral of eastward water vapour flux
+'162071' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 150 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
+#Vertical integral of northward water vapour flux
+'162072' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 151 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
 #Surface runoff
 '174008' = {
 	 discipline = 2 ;
@@ -4794,6 +4977,12 @@
 	 typeOfGeneratingProcess = 20 ;
 	 is_chemical = 1 ;
 	}
+#Friction velocity
+'228003' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 17 ;
+	}
 #Lake total depth
 '228007' = {
 	 discipline = 1 ;
@@ -5017,12 +5206,6 @@
 	 parameterCategory = 2 ;
 	 parameterNumber = 12 ;
 	}
-#Boundary layer dissipation
-'145' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 20 ;
-	}
 #Surface sensible heat flux
 '146' = {
 	 discipline = 0 ;
@@ -5113,7 +5296,7 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 1 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 '176' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -5121,7 +5304,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 '177' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
@@ -5129,7 +5312,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 '179' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
@@ -5173,12 +5356,6 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 10 ;
 	}
-#Sensible heat net flux
-'260003' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 11 ;
-	}
 #Heat index
 '260004' = {
 	 discipline = 0 ;
@@ -5448,6 +5625,7 @@
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
 	 parameterNumber = 52 ;
+	 typeOfFirstFixedSurface = 1 ;
 	}
 #Total snowfall rate water equivalent
 '260049' = {
@@ -5472,6 +5650,7 @@
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
 	 parameterNumber = 56 ;
+	 typeOfFirstFixedSurface = 1 ;
 	}
 #Total snowfall rate
 '260053' = {
@@ -5647,12 +5826,6 @@
 	 parameterCategory = 3 ;
 	 parameterNumber = 17 ;
 	}
-#Planetary boundary layer height
-'260083' = {
-	 discipline = 0 ;
-	 parameterCategory = 3 ;
-	 parameterNumber = 18 ;
-	}
 #5-wave geopotential height anomaly
 '260084' = {
 	 discipline = 0 ;

definitions/grib2/shortName.def

@@ -136,6 +136,7 @@
 	 discipline = 10 ;
 	 parameterCategory = 2 ;
 	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
 	}
 #Snow density
 'rsn' = {
@@ -165,6 +166,30 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
+#Large-scale precipitation fraction
+'lspf' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 36 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Downward UV radiation at the surface
+'uvb' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 12 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Photosynthetically active radiation at the surface
+'par' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 10 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
 #Specific rain water content
 'crwc' = {
 	 discipline = 0 ;
@@ -204,8 +229,23 @@
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
 	 parameterNumber = 64 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
 	}
-#Surface short-wave radiation downwards
+#Boundary layer dissipation
+'bld' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 20 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Boundary layer height
+'blh' = {
+	 discipline = 0 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 18 ;
+	}
+#Surface short-wave (solar) radiation downwards
 'ssrd' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -213,7 +253,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface long-wave radiation downwards
+#Surface long-wave (thermal) radiation downwards
 'strd' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
@@ -221,7 +261,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 'tsr' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -234,12 +274,39 @@
 	 discipline = 0 ;
 	 parameterCategory = 2 ;
 	 parameterNumber = 38 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Northward turbulent surface stress
 'nsss' = {
 	 discipline = 0 ;
 	 parameterCategory = 2 ;
 	 parameterNumber = 37 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Eastward gravity wave surface stress
+'lgws' = {
+	 discipline = 0 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 16 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Northward gravity wave surface stress
+'mgws' = {
+	 discipline = 0 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 17 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Gravity wave dissipation
+'gwd' = {
+	 discipline = 0 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 23 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Ozone mass mixing ratio
 'o3' = {
@@ -247,7 +314,23 @@
 	 parameterCategory = 14 ;
 	 parameterNumber = 1 ;
 	}
-#Surface net short-wave radiation, clear sky
+#Top net solar radiation, clear sky
+'tsrc' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 11 ;
+	 typeOfFirstFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Top net thermal radiation, clear sky
+'ttrc' = {
+	 discipline = 0 ;
+	 parameterCategory = 5 ;
+	 parameterNumber = 6 ;
+	 typeOfFirstFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Surface net short-wave (solar) radiation, clear sky
 'ssrc' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -255,7 +338,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface net long-wave radiation, clear sky
+#Surface net long-wave (thermal) radiation, clear sky
 'strc' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
@@ -263,6 +346,42 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
+#TOA incident solar radiation
+'tisr' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 7 ;
+	 typeOfFirstFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Instantaneous eastward turbulent surface stress
+'iews' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 38 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
+#Instantaneous northward turbulent surface stress
+'inss' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 37 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
+#Instantaneous surface sensible heat flux
+'ishf' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 11 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
+#Instantaneous moisture flux
+'ie' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 79 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
 #Temperature of snow layer
 'tsn' = {
 	 discipline = 2 ;
@@ -1875,12 +1994,6 @@
 	 parameterCategory = 19 ;
 	 parameterNumber = 19 ;
 	}
-#Fraction of stratiform precipitation cover
-'fspc' = {
-	 discipline = 0 ;
-	 parameterCategory = 6 ;
-	 parameterNumber = 36 ;
-	}
 #Fraction of convective precipitation cover
 'fcpc' = {
 	 discipline = 0 ;
@@ -2062,6 +2175,28 @@
 	 scaledValueOfSecondFixedSurface = 10 ;
 	 scaleFactorOfSecondFixedSurface = 1 ;
 	}
+#Total column rain water
+'tcrw' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 45 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
+#Total column snow water
+'tcsw' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 46 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
+#Ice temperature
+'ist' = {
+	 discipline = 1 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 6 ;
+	}
 #Soil temperature top 20 cm
 'st20' = {
 	 discipline = 2 ;
@@ -2109,6 +2244,13 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 33 ;
 	}
+#Instantaneous large-scale surface precipitation fraction
+'ilspf' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 36 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
 #Convective rain rate
 'crr' = {
 	 discipline = 0 ;
@@ -2288,6 +2430,37 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 49 ;
 	}
+#Accumulated freezing rain water equivalent
+'fzrawe' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 67 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Runoff water equivalent
+'rowe' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 42 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Snow evaporation water equivalent
+'eswe' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 148 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Total snowfall water equivalent
+'asnowwe' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 53 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
 #Mean temperature tendency due to short-wave radiation
 'mttswr' = {
 	 discipline = 0 ;
@@ -2671,12 +2844,6 @@
 	 parameterCategory = 6 ;
 	 parameterNumber = 22 ;
 	}
-#Evaporation rate
-'evarate' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 79 ;
-	}
 #Evaporation
 'eva' = {
 	 discipline = 0 ;
@@ -4720,6 +4887,22 @@
 	 parameterNumber = 3 ;
 	 typeOfFirstFixedSurface = 160 ;
 	}
+#Vertical integral of eastward water vapour flux
+'viwve' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 150 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
+#Vertical integral of northward water vapour flux
+'viwvn' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 151 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
 #Surface runoff
 'sro' = {
 	 discipline = 2 ;
@@ -4794,6 +4977,12 @@
 	 typeOfGeneratingProcess = 20 ;
 	 is_chemical = 1 ;
 	}
+#Friction velocity
+'zust' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 17 ;
+	}
 #Lake total depth
 'dl' = {
 	 discipline = 1 ;
@@ -5017,12 +5206,6 @@
 	 parameterCategory = 2 ;
 	 parameterNumber = 12 ;
 	}
-#Boundary layer dissipation
-'bld' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 20 ;
-	}
 #Surface sensible heat flux
 'sshf' = {
 	 discipline = 0 ;
@@ -5113,7 +5296,7 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 1 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'ssr' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -5121,7 +5304,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'str' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
@@ -5129,7 +5312,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 'ttr' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
@@ -5173,12 +5356,6 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 10 ;
 	}
-#Sensible heat net flux
-'shtfl' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 11 ;
-	}
 #Heat index
 'heatx' = {
 	 discipline = 0 ;
@@ -5448,6 +5625,7 @@
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
 	 parameterNumber = 52 ;
+	 typeOfFirstFixedSurface = 1 ;
 	}
 #Total snowfall rate water equivalent
 'tsrwe' = {
@@ -5472,6 +5650,7 @@
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
 	 parameterNumber = 56 ;
+	 typeOfFirstFixedSurface = 1 ;
 	}
 #Total snowfall rate
 'tsrate' = {
@@ -5647,12 +5826,6 @@
 	 parameterCategory = 3 ;
 	 parameterNumber = 17 ;
 	}
-#Planetary boundary layer height
-'hpbl' = {
-	 discipline = 0 ;
-	 parameterCategory = 3 ;
-	 parameterNumber = 18 ;
-	}
 #5-wave geopotential height anomaly
 '5wava' = {
 	 discipline = 0 ;

definitions/grib2/units.def

@@ -136,6 +136,7 @@
 	 discipline = 10 ;
 	 parameterCategory = 2 ;
 	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
 	}
 #Snow density
 'kg m**-3' = {
@@ -165,6 +166,30 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
+#Large-scale precipitation fraction
+'s' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 36 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Downward UV radiation at the surface
+'J m**-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 12 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Photosynthetically active radiation at the surface
+'J m**-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 10 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
 #Specific rain water content
 'kg kg**-1' = {
 	 discipline = 0 ;
@@ -204,8 +229,23 @@
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
 	 parameterNumber = 64 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
 	}
-#Surface short-wave radiation downwards
+#Boundary layer dissipation
+'J m**-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 20 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Boundary layer height
+'m' = {
+	 discipline = 0 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 18 ;
+	}
+#Surface short-wave (solar) radiation downwards
 'J m**-2' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -213,7 +253,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface long-wave radiation downwards
+#Surface long-wave (thermal) radiation downwards
 'J m**-2' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
@@ -221,7 +261,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 'J m**-2' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -234,12 +274,39 @@
 	 discipline = 0 ;
 	 parameterCategory = 2 ;
 	 parameterNumber = 38 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Northward turbulent surface stress
 'N m**-2 s' = {
 	 discipline = 0 ;
 	 parameterCategory = 2 ;
 	 parameterNumber = 37 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Eastward gravity wave surface stress
+'N m**-2 s' = {
+	 discipline = 0 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 16 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Northward gravity wave surface stress
+'N m**-2 s' = {
+	 discipline = 0 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 17 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Gravity wave dissipation
+'J m**-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 23 ;
+	 typeOfStatisticalProcessing = 1 ;
 	}
 #Ozone mass mixing ratio
 'kg kg**-1' = {
@@ -247,7 +314,23 @@
 	 parameterCategory = 14 ;
 	 parameterNumber = 1 ;
 	}
-#Surface net short-wave radiation, clear sky
+#Top net solar radiation, clear sky
+'J m**-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 11 ;
+	 typeOfFirstFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Top net thermal radiation, clear sky
+'J m**-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 5 ;
+	 parameterNumber = 6 ;
+	 typeOfFirstFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Surface net short-wave (solar) radiation, clear sky
 'J m**-2' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -255,7 +338,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface net long-wave radiation, clear sky
+#Surface net long-wave (thermal) radiation, clear sky
 'J m**-2' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
@@ -263,6 +346,42 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
+#TOA incident solar radiation
+'J m**-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 7 ;
+	 typeOfFirstFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Instantaneous eastward turbulent surface stress
+'N m**-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 38 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
+#Instantaneous northward turbulent surface stress
+'N m**-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 37 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
+#Instantaneous surface sensible heat flux
+'W m**-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 11 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
+#Instantaneous moisture flux
+'kg m**-2 s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 79 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
 #Temperature of snow layer
 'K' = {
 	 discipline = 2 ;
@@ -1875,12 +1994,6 @@
 	 parameterCategory = 19 ;
 	 parameterNumber = 19 ;
 	}
-#Fraction of stratiform precipitation cover
-'Proportion' = {
-	 discipline = 0 ;
-	 parameterCategory = 6 ;
-	 parameterNumber = 36 ;
-	}
 #Fraction of convective precipitation cover
 'Proportion' = {
 	 discipline = 0 ;
@@ -2062,6 +2175,28 @@
 	 scaledValueOfSecondFixedSurface = 10 ;
 	 scaleFactorOfSecondFixedSurface = 1 ;
 	}
+#Total column rain water
+'kg m**-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 45 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
+#Total column snow water
+'kg m**-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 46 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
+#Ice temperature
+'K' = {
+	 discipline = 1 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 6 ;
+	}
 #Soil temperature top 20 cm
 'K' = {
 	 discipline = 2 ;
@@ -2109,6 +2244,13 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 33 ;
 	}
+#Instantaneous large-scale surface precipitation fraction
+'(0 - 1)' = {
+	 discipline = 0 ;
+	 parameterCategory = 6 ;
+	 parameterNumber = 36 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
 #Convective rain rate
 'kg m**-2 s**-1' = {
 	 discipline = 0 ;
@@ -2288,6 +2430,37 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 49 ;
 	}
+#Accumulated freezing rain water equivalent
+'kg m**-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 67 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Runoff water equivalent
+'kg m**-2' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 42 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Snow evaporation water equivalent
+'kg m**-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 148 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Total snowfall water equivalent
+'kg m**-2' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 53 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
 #Mean temperature tendency due to short-wave radiation
 'K s**-1' = {
 	 discipline = 0 ;
@@ -2671,12 +2844,6 @@
 	 parameterCategory = 6 ;
 	 parameterNumber = 22 ;
 	}
-#Evaporation rate
-'kg m**-2 s**-1' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 79 ;
-	}
 #Evaporation
 'kg m**-2' = {
 	 discipline = 0 ;
@@ -4720,6 +4887,22 @@
 	 parameterNumber = 3 ;
 	 typeOfFirstFixedSurface = 160 ;
 	}
+#Vertical integral of eastward water vapour flux
+'kg m**-1 s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 150 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
+#Vertical integral of northward water vapour flux
+'kg m**-1 s**-1' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 151 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfSecondFixedSurface = 8 ;
+	}
 #Surface runoff
 'kg m**-2' = {
 	 discipline = 2 ;
@@ -4794,6 +4977,12 @@
 	 typeOfGeneratingProcess = 20 ;
 	 is_chemical = 1 ;
 	}
+#Friction velocity
+'m s**-1' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 17 ;
+	}
 #Lake total depth
 'm' = {
 	 discipline = 1 ;
@@ -5017,12 +5206,6 @@
 	 parameterCategory = 2 ;
 	 parameterNumber = 12 ;
 	}
-#Boundary layer dissipation
-'J m**-2' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 20 ;
-	}
 #Surface sensible heat flux
 'J m**-2' = {
 	 discipline = 0 ;
@@ -5113,7 +5296,7 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 1 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'J m**-2' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -5121,7 +5304,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'J m**-2' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
@@ -5129,7 +5312,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 'J m**-2' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
@@ -5173,12 +5356,6 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 10 ;
 	}
-#Sensible heat net flux
-'W m**-2' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 11 ;
-	}
 #Heat index
 'K' = {
 	 discipline = 0 ;
@@ -5448,6 +5625,7 @@
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
 	 parameterNumber = 52 ;
+	 typeOfFirstFixedSurface = 1 ;
 	}
 #Total snowfall rate water equivalent
 'kg m**-2 s**-1' = {
@@ -5472,6 +5650,7 @@
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
 	 parameterNumber = 56 ;
+	 typeOfFirstFixedSurface = 1 ;
 	}
 #Total snowfall rate
 'm s**-1' = {
@@ -5647,12 +5826,6 @@
 	 parameterCategory = 3 ;
 	 parameterNumber = 17 ;
 	}
-#Planetary boundary layer height
-'m' = {
-	 discipline = 0 ;
-	 parameterCategory = 3 ;
-	 parameterNumber = 18 ;
-	}
 #5-wave geopotential height anomaly
 'gpm' = {
 	 discipline = 0 ;

tests/grib_cfNames.sh

@@ -18,17 +18,22 @@ sample2=$ECCODES_SAMPLES_PATH/GRIB2.tmpl
 ${tools_dir}/grib_set -s discipline=192,parameterCategory=128,parameterNumber=137 $sample2 $temp
 grib_check_key_equals $temp cfName lwe_thickness_of_atmosphere_mass_content_of_water_vapor
 
-${tools_dir}/grib_set -s discipline=0,parameterNumber=20,parameterCategory=2 $sample2 $temp
+${tools_dir}/grib_set -s productDefinitionTemplateNumber=8,discipline=0,parameterNumber=20,parameterCategory=2,typeOfStatisticalProcessing=1 $sample2 $temp
 grib_check_key_equals $temp cfName kinetic_energy_dissipation_in_atmosphere_boundary_layer
-${tools_dir}/grib_set -s paramId=145 $sample2 $temp
+${tools_dir}/grib_set -s stepType=accum,discipline=0,parameterNumber=20,parameterCategory=2 $sample2 $temp
 grib_check_key_equals $temp cfName kinetic_energy_dissipation_in_atmosphere_boundary_layer
+${tools_dir}/grib_set -s productDefinitionTemplateNumber=8,paramId=145 $sample2 $temp
+grib_check_key_equals $temp cfName kinetic_energy_dissipation_in_atmosphere_boundary_layer
+${tools_dir}/grib_set -s stepType=accum,paramId=145 $sample2 $temp
+grib_check_key_equals $temp cfName kinetic_energy_dissipation_in_atmosphere_boundary_layer
+
 ${tools_dir}/grib_set -s paramId=137 $sample2 $temp
 grib_check_key_equals $temp cfName lwe_thickness_of_atmosphere_mass_content_of_water_vapor
 
 ${tools_dir}/grib_set -s indicatorOfParameter=137,table2Version=128 $sample1 $temp
 grib_check_key_equals $temp cfName lwe_thickness_of_atmosphere_mass_content_of_water_vapor
 
-${tools_dir}/grib_set -s paramId=145 $sample2 $temp
+${tools_dir}/grib_set -s productDefinitionTemplateNumber=8,paramId=145 $sample2 $temp
 grib_check_key_equals $temp cfName kinetic_energy_dissipation_in_atmosphere_boundary_layer
 
 ${tools_dir}/grib_set -s indicatorOfParameter=122,table2Version=1 $sample1 $temp