ECC-1752 and ECC-1753: Harmonise cfVarName.def files (new DB design)

definitions/grib1/cfName.def

@@ -4,345 +4,345 @@
 	 table2Version = 3 ;
 	 indicatorOfParameter = 6 ;
 	}
-#Temperature
-'air_temperature' = {
-	 table2Version = 3 ;
-	 indicatorOfParameter = 11 ;
-	}
-#U component of wind
-'eastward_wind' = {
-	 table2Version = 3 ;
-	 indicatorOfParameter = 33 ;
-	}
-#V component of wind
-'northward_wind' = {
-	 table2Version = 3 ;
-	 indicatorOfParameter = 34 ;
-	}
-#Specific humidity
-'specific_humidity' = {
-	 table2Version = 3 ;
-	 indicatorOfParameter = 51 ;
-	}
-#Surface pressure
-'surface_air_pressure' = {
-	 table2Version = 3 ;
-	 indicatorOfParameter = 1 ;
-	 indicatorOfTypeOfLevel = 1 ;
-	}
-#Vertical velocity
-'lagrangian_tendency_of_air_pressure' = {
-	 table2Version = 3 ;
-	 indicatorOfParameter = 39 ;
-	}
-#Vorticity (relative)
-'atmosphere_relative_vorticity' = {
-	 table2Version = 3 ;
-	 indicatorOfParameter = 43 ;
-	}
-#Mean sea level pressure
-'air_pressure_at_mean_sea_level' = {
-	 table2Version = 3 ;
-	 indicatorOfParameter = 2 ;
-	}
-#Divergence
-'divergence_of_wind' = {
-	 table2Version = 3 ;
-	 indicatorOfParameter = 44 ;
-	}
-#Geopotential height
-'geopotential_height' = {
-	 table2Version = 3 ;
-	 indicatorOfParameter = 7 ;
-	}
-#Relative humidity
-'relative_humidity' = {
-	 table2Version = 3 ;
-	 indicatorOfParameter = 52 ;
-	}
-#Land-sea mask
-'land_binary_mask' = {
-	 table2Version = 3 ;
-	 indicatorOfParameter = 81 ;
-	}
-#Surface roughness (climatological)
-'surface_roughness_length' = {
-	 table2Version = 3 ;
-	 indicatorOfParameter = 83 ;
-	}
-#Evaporation
-'lwe_thickness_of_water_evaporation_amount' = {
-	 table2Version = 3 ;
-	 indicatorOfParameter = 57 ;
-	}
-#Total column ozone
-'atmosphere_mass_content_of_ozone' = {
-	 table2Version = 3 ;
-	 indicatorOfParameter = 10 ;
-	}
-#Snow depth
-'lwe_thickness_of_surface_snow_amount' = {
-	 table2Version = 3 ;
-	 indicatorOfParameter = 66 ;
-	}
-#Convective cloud cover
-'convective_cloud_area_fraction' = {
-	 table2Version = 3 ;
-	 indicatorOfParameter = 72 ;
-	}
-#Latent heat flux
-'surface_upward_latent_heat_flux' = {
-	 table2Version = 3 ;
-	 indicatorOfParameter = 121 ;
-	}
-#Sensible heat flux
-'surface_upward_sensible_heat_flux' = {
-	 table2Version = 3 ;
-	 indicatorOfParameter = 122 ;
-	}
-#Boundary layer dissipation
-'kinetic_energy_dissipation_in_atmosphere_boundary_layer' = {
-	 table2Version = 3 ;
-	 indicatorOfParameter = 123 ;
-	}
-#Forecast albedo
-'surface_albedo' = {
-	 table2Version = 3 ;
-	 indicatorOfParameter = 84 ;
-	}
-#Convective precipitation (water)
-'lwe_thickness_of_convective_precipitation_amount' = {
-	 table2Version = 3 ;
-	 indicatorOfParameter = 63 ;
-	}
 #Geopotential
 'geopotential' = {
 	 table2Version = 2 ;
 	 indicatorOfParameter = 6 ;
 	}
-#Temperature
-'air_temperature' = {
-	 table2Version = 2 ;
-	 indicatorOfParameter = 11 ;
-	}
-#U component of wind
-'eastward_wind' = {
-	 table2Version = 2 ;
-	 indicatorOfParameter = 33 ;
-	}
-#V component of wind
-'northward_wind' = {
-	 table2Version = 2 ;
-	 indicatorOfParameter = 34 ;
-	}
-#Specific humidity
-'specific_humidity' = {
-	 table2Version = 2 ;
-	 indicatorOfParameter = 51 ;
-	}
-#Surface pressure
-'surface_air_pressure' = {
-	 table2Version = 2 ;
-	 indicatorOfParameter = 1 ;
-	 indicatorOfTypeOfLevel = 1 ;
-	}
-#Vertical velocity
-'lagrangian_tendency_of_air_pressure' = {
-	 table2Version = 2 ;
-	 indicatorOfParameter = 39 ;
-	}
-#Vorticity (relative)
-'atmosphere_relative_vorticity' = {
-	 table2Version = 2 ;
-	 indicatorOfParameter = 43 ;
-	}
-#Mean sea level pressure
-'air_pressure_at_mean_sea_level' = {
-	 table2Version = 2 ;
-	 indicatorOfParameter = 2 ;
-	}
-#Divergence
-'divergence_of_wind' = {
-	 table2Version = 2 ;
-	 indicatorOfParameter = 44 ;
-	}
-#Geopotential height
-'geopotential_height' = {
-	 table2Version = 2 ;
-	 indicatorOfParameter = 7 ;
-	}
-#Relative humidity
-'relative_humidity' = {
-	 table2Version = 2 ;
-	 indicatorOfParameter = 52 ;
-	}
-#Land-sea mask
-'land_binary_mask' = {
-	 table2Version = 2 ;
-	 indicatorOfParameter = 81 ;
-	}
-#Surface roughness (climatological)
-'surface_roughness_length' = {
-	 table2Version = 2 ;
-	 indicatorOfParameter = 83 ;
-	}
-#Evaporation
-'lwe_thickness_of_water_evaporation_amount' = {
-	 table2Version = 2 ;
-	 indicatorOfParameter = 57 ;
-	}
-#Total column ozone
-'atmosphere_mass_content_of_ozone' = {
-	 table2Version = 2 ;
-	 indicatorOfParameter = 10 ;
-	}
-#Snow depth
-'lwe_thickness_of_surface_snow_amount' = {
-	 table2Version = 2 ;
-	 indicatorOfParameter = 66 ;
-	}
-#Convective cloud cover
-'convective_cloud_area_fraction' = {
-	 table2Version = 2 ;
-	 indicatorOfParameter = 72 ;
-	}
-#Latent heat flux
-'surface_upward_latent_heat_flux' = {
-	 table2Version = 2 ;
-	 indicatorOfParameter = 121 ;
-	}
-#Sensible heat flux
-'surface_upward_sensible_heat_flux' = {
-	 table2Version = 2 ;
-	 indicatorOfParameter = 122 ;
-	}
-#Boundary layer dissipation
-'kinetic_energy_dissipation_in_atmosphere_boundary_layer' = {
-	 table2Version = 2 ;
-	 indicatorOfParameter = 123 ;
-	}
-#Forecast albedo
-'surface_albedo' = {
-	 table2Version = 2 ;
-	 indicatorOfParameter = 84 ;
-	}
-#Convective precipitation (water)
-'lwe_thickness_of_convective_precipitation_amount' = {
-	 table2Version = 2 ;
-	 indicatorOfParameter = 63 ;
-	}
 #Geopotential
 'geopotential' = {
 	 table2Version = 1 ;
 	 indicatorOfParameter = 6 ;
 	}
 #Temperature
+'air_temperature' = {
+	 table2Version = 3 ;
+	 indicatorOfParameter = 11 ;
+	}
+#Temperature
+'air_temperature' = {
+	 table2Version = 2 ;
+	 indicatorOfParameter = 11 ;
+	}
+#Temperature
 'air_temperature' = {
 	 table2Version = 1 ;
 	 indicatorOfParameter = 11 ;
 	}
 #U component of wind
+'eastward_wind' = {
+	 table2Version = 3 ;
+	 indicatorOfParameter = 33 ;
+	}
+#U component of wind
+'eastward_wind' = {
+	 table2Version = 2 ;
+	 indicatorOfParameter = 33 ;
+	}
+#U component of wind
 'eastward_wind' = {
 	 table2Version = 1 ;
 	 indicatorOfParameter = 33 ;
 	}
 #V component of wind
+'northward_wind' = {
+	 table2Version = 3 ;
+	 indicatorOfParameter = 34 ;
+	}
+#V component of wind
+'northward_wind' = {
+	 table2Version = 2 ;
+	 indicatorOfParameter = 34 ;
+	}
+#V component of wind
 'northward_wind' = {
 	 table2Version = 1 ;
 	 indicatorOfParameter = 34 ;
 	}
 #Specific humidity
+'specific_humidity' = {
+	 table2Version = 3 ;
+	 indicatorOfParameter = 51 ;
+	}
+#Specific humidity
+'specific_humidity' = {
+	 table2Version = 2 ;
+	 indicatorOfParameter = 51 ;
+	}
+#Specific humidity
 'specific_humidity' = {
 	 table2Version = 1 ;
 	 indicatorOfParameter = 51 ;
 	}
 #Surface pressure
+'surface_air_pressure' = {
+	 table2Version = 3 ;
+	 indicatorOfParameter = 1 ;
+	 indicatorOfTypeOfLevel = 1 ;
+	}
+#Surface pressure
+'surface_air_pressure' = {
+	 table2Version = 2 ;
+	 indicatorOfParameter = 1 ;
+	 indicatorOfTypeOfLevel = 1 ;
+	}
+#Surface pressure
 'surface_air_pressure' = {
 	 table2Version = 1 ;
 	 indicatorOfParameter = 1 ;
 	 indicatorOfTypeOfLevel = 1 ;
 	}
 #Vertical velocity
+'lagrangian_tendency_of_air_pressure' = {
+	 table2Version = 3 ;
+	 indicatorOfParameter = 39 ;
+	}
+#Vertical velocity
+'lagrangian_tendency_of_air_pressure' = {
+	 table2Version = 2 ;
+	 indicatorOfParameter = 39 ;
+	}
+#Vertical velocity
 'lagrangian_tendency_of_air_pressure' = {
 	 table2Version = 1 ;
 	 indicatorOfParameter = 39 ;
 	}
 #Vorticity (relative)
+'atmosphere_relative_vorticity' = {
+	 table2Version = 3 ;
+	 indicatorOfParameter = 43 ;
+	}
+#Vorticity (relative)
+'atmosphere_relative_vorticity' = {
+	 table2Version = 2 ;
+	 indicatorOfParameter = 43 ;
+	}
+#Vorticity (relative)
 'atmosphere_relative_vorticity' = {
 	 table2Version = 1 ;
 	 indicatorOfParameter = 43 ;
 	}
 #Mean sea level pressure
+'air_pressure_at_mean_sea_level' = {
+	 table2Version = 3 ;
+	 indicatorOfParameter = 2 ;
+	}
+#Mean sea level pressure
+'air_pressure_at_mean_sea_level' = {
+	 table2Version = 2 ;
+	 indicatorOfParameter = 2 ;
+	}
+#Mean sea level pressure
 'air_pressure_at_mean_sea_level' = {
 	 table2Version = 1 ;
 	 indicatorOfParameter = 2 ;
 	}
 #Divergence
+'divergence_of_wind' = {
+	 table2Version = 3 ;
+	 indicatorOfParameter = 44 ;
+	}
+#Divergence
+'divergence_of_wind' = {
+	 table2Version = 2 ;
+	 indicatorOfParameter = 44 ;
+	}
+#Divergence
 'divergence_of_wind' = {
 	 table2Version = 1 ;
 	 indicatorOfParameter = 44 ;
 	}
 #Geopotential height
+'geopotential_height' = {
+	 table2Version = 3 ;
+	 indicatorOfParameter = 7 ;
+	}
+#Geopotential height
+'geopotential_height' = {
+	 table2Version = 2 ;
+	 indicatorOfParameter = 7 ;
+	}
+#Geopotential height
 'geopotential_height' = {
 	 table2Version = 1 ;
 	 indicatorOfParameter = 7 ;
 	}
 #Relative humidity
+'relative_humidity' = {
+	 table2Version = 3 ;
+	 indicatorOfParameter = 52 ;
+	}
+#Relative humidity
+'relative_humidity' = {
+	 table2Version = 2 ;
+	 indicatorOfParameter = 52 ;
+	}
+#Relative humidity
 'relative_humidity' = {
 	 table2Version = 1 ;
 	 indicatorOfParameter = 52 ;
 	}
 #Land-sea mask
+'land_binary_mask' = {
+	 table2Version = 3 ;
+	 indicatorOfParameter = 81 ;
+	}
+#Land-sea mask
+'land_binary_mask' = {
+	 table2Version = 2 ;
+	 indicatorOfParameter = 81 ;
+	}
+#Land-sea mask
 'land_binary_mask' = {
 	 table2Version = 1 ;
 	 indicatorOfParameter = 81 ;
 	}
 #Surface roughness (climatological)
+'surface_roughness_length' = {
+	 table2Version = 3 ;
+	 indicatorOfParameter = 83 ;
+	}
+#Surface roughness (climatological)
+'surface_roughness_length' = {
+	 table2Version = 2 ;
+	 indicatorOfParameter = 83 ;
+	}
+#Surface roughness (climatological)
 'surface_roughness_length' = {
 	 table2Version = 1 ;
 	 indicatorOfParameter = 83 ;
 	}
 #Evaporation
+'lwe_thickness_of_water_evaporation_amount' = {
+	 table2Version = 3 ;
+	 indicatorOfParameter = 57 ;
+	}
+#Evaporation
+'lwe_thickness_of_water_evaporation_amount' = {
+	 table2Version = 2 ;
+	 indicatorOfParameter = 57 ;
+	}
+#Evaporation
 'lwe_thickness_of_water_evaporation_amount' = {
 	 table2Version = 1 ;
 	 indicatorOfParameter = 57 ;
 	}
 #Total column ozone
+'atmosphere_mass_content_of_ozone' = {
+	 table2Version = 3 ;
+	 indicatorOfParameter = 10 ;
+	}
+#Total column ozone
+'atmosphere_mass_content_of_ozone' = {
+	 table2Version = 2 ;
+	 indicatorOfParameter = 10 ;
+	}
+#Total column ozone
 'atmosphere_mass_content_of_ozone' = {
 	 table2Version = 1 ;
 	 indicatorOfParameter = 10 ;
 	}
 #Snow depth
+'lwe_thickness_of_surface_snow_amount' = {
+	 table2Version = 3 ;
+	 indicatorOfParameter = 66 ;
+	}
+#Snow depth
+'lwe_thickness_of_surface_snow_amount' = {
+	 table2Version = 2 ;
+	 indicatorOfParameter = 66 ;
+	}
+#Snow depth
 'lwe_thickness_of_surface_snow_amount' = {
 	 table2Version = 1 ;
 	 indicatorOfParameter = 66 ;
 	}
 #Convective cloud cover
+'convective_cloud_area_fraction' = {
+	 table2Version = 3 ;
+	 indicatorOfParameter = 72 ;
+	}
+#Convective cloud cover
+'convective_cloud_area_fraction' = {
+	 table2Version = 2 ;
+	 indicatorOfParameter = 72 ;
+	}
+#Convective cloud cover
 'convective_cloud_area_fraction' = {
 	 table2Version = 1 ;
 	 indicatorOfParameter = 72 ;
 	}
 #Latent heat flux
+'surface_upward_latent_heat_flux' = {
+	 table2Version = 3 ;
+	 indicatorOfParameter = 121 ;
+	}
+#Latent heat flux
+'surface_upward_latent_heat_flux' = {
+	 table2Version = 2 ;
+	 indicatorOfParameter = 121 ;
+	}
+#Latent heat flux
 'surface_upward_latent_heat_flux' = {
 	 table2Version = 1 ;
 	 indicatorOfParameter = 121 ;
 	}
 #Sensible heat flux
+'surface_upward_sensible_heat_flux' = {
+	 table2Version = 3 ;
+	 indicatorOfParameter = 122 ;
+	}
+#Sensible heat flux
+'surface_upward_sensible_heat_flux' = {
+	 table2Version = 2 ;
+	 indicatorOfParameter = 122 ;
+	}
+#Sensible heat flux
 'surface_upward_sensible_heat_flux' = {
 	 table2Version = 1 ;
 	 indicatorOfParameter = 122 ;
 	}
 #Boundary layer dissipation
+'kinetic_energy_dissipation_in_atmosphere_boundary_layer' = {
+	 table2Version = 3 ;
+	 indicatorOfParameter = 123 ;
+	}
+#Boundary layer dissipation
+'kinetic_energy_dissipation_in_atmosphere_boundary_layer' = {
+	 table2Version = 2 ;
+	 indicatorOfParameter = 123 ;
+	}
+#Boundary layer dissipation
 'kinetic_energy_dissipation_in_atmosphere_boundary_layer' = {
 	 table2Version = 1 ;
 	 indicatorOfParameter = 123 ;
 	}
 #Forecast albedo
+'surface_albedo' = {
+	 table2Version = 3 ;
+	 indicatorOfParameter = 84 ;
+	}
+#Forecast albedo
+'surface_albedo' = {
+	 table2Version = 2 ;
+	 indicatorOfParameter = 84 ;
+	}
+#Forecast albedo
 'surface_albedo' = {
 	 table2Version = 1 ;
 	 indicatorOfParameter = 84 ;
 	}
 #Convective precipitation (water)
+'lwe_thickness_of_convective_precipitation_amount' = {
+	 table2Version = 3 ;
+	 indicatorOfParameter = 63 ;
+	}
+#Convective precipitation (water)
+'lwe_thickness_of_convective_precipitation_amount' = {
+	 table2Version = 2 ;
+	 indicatorOfParameter = 63 ;
+	}
+#Convective precipitation (water)
 'lwe_thickness_of_convective_precipitation_amount' = {
 	 table2Version = 1 ;
 	 indicatorOfParameter = 63 ;

definitions/grib1/localConcepts/rjtd/cfName.def

@@ -0,0 +1,112 @@
+# Automatically generated by ./create_def.pl, do not edit
+#Sea ice area fraction
+'sea_ice_area_fraction' = {
+	 table2Version = 200 ;
+	 indicatorOfParameter = 91 ;
+	}
+#Geopotential
+'geopotential' = {
+	 table2Version = 200 ;
+	 indicatorOfParameter = 6 ;
+	}
+#Temperature
+'air_temperature' = {
+	 table2Version = 200 ;
+	 indicatorOfParameter = 11 ;
+	}
+#U component of wind
+'eastward_wind' = {
+	 table2Version = 200 ;
+	 indicatorOfParameter = 33 ;
+	}
+#V component of wind
+'northward_wind' = {
+	 table2Version = 200 ;
+	 indicatorOfParameter = 34 ;
+	}
+#Specific humidity
+'specific_humidity' = {
+	 table2Version = 200 ;
+	 indicatorOfParameter = 51 ;
+	}
+#Surface pressure
+'surface_air_pressure' = {
+	 table2Version = 200 ;
+	 indicatorOfParameter = 1 ;
+	 indicatorOfTypeOfLevel = 1 ;
+	}
+#Vertical velocity
+'lagrangian_tendency_of_air_pressure' = {
+	 table2Version = 200 ;
+	 indicatorOfParameter = 39 ;
+	}
+#Total column vertically-integrated water vapour
+'lwe_thickness_of_atmosphere_mass_content_of_water_vapor' = {
+	 table2Version = 200 ;
+	 indicatorOfParameter = 54 ;
+	}
+#Vorticity (relative)
+'atmosphere_relative_vorticity' = {
+	 table2Version = 200 ;
+	 indicatorOfParameter = 43 ;
+	}
+#Mean sea level pressure
+'air_pressure_at_mean_sea_level' = {
+	 table2Version = 200 ;
+	 indicatorOfParameter = 2 ;
+	}
+#Divergence
+'divergence_of_wind' = {
+	 table2Version = 200 ;
+	 indicatorOfParameter = 44 ;
+	}
+#Geopotential height
+'geopotential_height' = {
+	 table2Version = 200 ;
+	 indicatorOfParameter = 7 ;
+	}
+#Relative humidity
+'relative_humidity' = {
+	 table2Version = 200 ;
+	 indicatorOfParameter = 52 ;
+	}
+#Land-sea mask
+'land_binary_mask' = {
+	 table2Version = 200 ;
+	 indicatorOfParameter = 81 ;
+	}
+#Surface roughness (climatological)
+'surface_roughness_length' = {
+	 table2Version = 200 ;
+	 indicatorOfParameter = 83 ;
+	}
+#Snow depth
+'lwe_thickness_of_surface_snow_amount' = {
+	 table2Version = 200 ;
+	 indicatorOfParameter = 66 ;
+	}
+#Convective cloud cover
+'convective_cloud_area_fraction' = {
+	 table2Version = 200 ;
+	 indicatorOfParameter = 72 ;
+	}
+#Latent heat flux
+'surface_upward_latent_heat_flux' = {
+	 table2Version = 200 ;
+	 indicatorOfParameter = 121 ;
+	}
+#Sensible heat flux
+'surface_upward_sensible_heat_flux' = {
+	 table2Version = 200 ;
+	 indicatorOfParameter = 122 ;
+	}
+#Boundary layer dissipation
+'kinetic_energy_dissipation_in_atmosphere_boundary_layer' = {
+	 table2Version = 200 ;
+	 indicatorOfParameter = 123 ;
+	}
+#Forecast albedo
+'surface_albedo' = {
+	 table2Version = 200 ;
+	 indicatorOfParameter = 84 ;
+}

definitions/grib2/cfName.def

@@ -6,6 +6,49 @@
 	 parameterNumber = 0 ;
 	 typeOfFirstFixedSurface = 1 ;
 	}
+#Geopotential
+'geopotential' = {
+	 discipline = 0 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 4 ;
+	}
+#Temperature
+'air_temperature' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 0 ;
+	}
+#U component of wind
+'eastward_wind' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 2 ;
+	}
+#V component of wind
+'northward_wind' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 3 ;
+	}
+#Specific humidity
+'specific_humidity' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 0 ;
+	}
+#Surface pressure
+'surface_air_pressure' = {
+	 discipline = 0 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
+#Vertical velocity
+'lagrangian_tendency_of_air_pressure' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 8 ;
+	}
 #Total column vertically-integrated water vapour
 'lwe_thickness_of_atmosphere_mass_content_of_water_vapor' = {
 	 discipline = 0 ;
@@ -14,6 +57,12 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfSecondFixedSurface = 8 ;
 	}
+#Vorticity (relative)
+'atmosphere_relative_vorticity' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 12 ;
+	}
 #Boundary layer dissipation
 'kinetic_energy_dissipation_in_atmosphere_boundary_layer' = {
 	 discipline = 0 ;
@@ -21,6 +70,47 @@
 	 parameterNumber = 20 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
+#Surface sensible heat flux
+'surface_upward_sensible_heat_flux' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 11 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Surface latent heat flux
+'surface_upward_latent_heat_flux' = {
+	 discipline = 0 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 10 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Mean sea level pressure
+'air_pressure_at_mean_sea_level' = {
+	 discipline = 0 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 101 ;
+	}
+#Divergence
+'divergence_of_wind' = {
+	 discipline = 0 ;
+	 parameterCategory = 2 ;
+	 parameterNumber = 13 ;
+	}
+#Geopotential height
+'geopotential_height' = {
+	 discipline = 0 ;
+	 parameterCategory = 3 ;
+	 parameterNumber = 5 ;
+	}
+#Relative humidity
+'relative_humidity' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 1 ;
+	}
 #Surface short-wave (solar) radiation downwards
 'surface_downwelling_shortwave_flux_in_air' = {
 	 discipline = 0 ;
@@ -29,6 +119,13 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
+#Land-sea mask
+'land_binary_mask' = {
+	 discipline = 2 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 0 ;
+	 typeOfFirstFixedSurface = 1 ;
+	}
 #Surface roughness (climatological)
 'surface_roughness_length' = {
 	 discipline = 2 ;
@@ -37,6 +134,22 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfGeneratingProcess = 9 ;
 	}
+#Surface net short-wave (solar) radiation
+'surface_net_downward_shortwave_flux' = {
+	 discipline = 0 ;
+	 parameterCategory = 4 ;
+	 parameterNumber = 9 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
+#Surface net long-wave (thermal) radiation
+'surface_net_upward_longwave_flux' = {
+	 discipline = 0 ;
+	 parameterCategory = 5 ;
+	 parameterNumber = 5 ;
+	 typeOfFirstFixedSurface = 1 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
 #Top net short-wave (solar) radiation
 'toa_net_upward_shortwave_flux' = {
 	 discipline = 0 ;
@@ -45,6 +158,14 @@
 	 typeOfFirstFixedSurface = 8 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
+#Top net long-wave (thermal) radiation
+'toa_outgoing_longwave_flux' = {
+	 discipline = 0 ;
+	 parameterCategory = 5 ;
+	 parameterNumber = 5 ;
+	 typeOfFirstFixedSurface = 8 ;
+	 typeOfStatisticalProcessing = 1 ;
+	}
 #Time-integrated eastward turbulent surface stress
 'surface_downward_eastward_stress' = {
 	 discipline = 0 ;
@@ -150,6 +271,12 @@
 	 constituentType = 11 ;
 	 is_chemical = 1 ;
 	}
+#Forecast albedo
+'surface_albedo' = {
+	 discipline = 0 ;
+	 parameterCategory = 19 ;
+	 parameterNumber = 1 ;
+	}
 #Sea surface practical salinity
 'sea_surface_salinity' = {
 	 discipline = 10 ;
@@ -210,6 +337,12 @@
 	 scaledValueOfSecondFixedSurface = missing() ;
 	 scaleFactorOfSecondFixedSurface = missing() ;
 	}
+#Convective precipitation (water)
+'lwe_thickness_of_convective_precipitation_amount' = {
+	 discipline = 0 ;
+	 parameterCategory = 1 ;
+	 parameterNumber = 10 ;
+	}
 #Eastward sea water velocity
 'eastward_sea_water_velocity' = {
 	 discipline = 10 ;
@@ -256,136 +389,3 @@
 	 constituentType = 0 ;
 	 is_chemical = 1 ;
 }
-#Geopotential
-'geopotential' = {
-	 discipline = 0 ;
-	 parameterCategory = 3 ;
-	 parameterNumber = 4 ;
-	}
-#Temperature
-'air_temperature' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 0 ;
-	}
-#U component of wind
-'eastward_wind' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 2 ;
-	}
-#V component of wind
-'northward_wind' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 3 ;
-	}
-#Specific humidity
-'specific_humidity' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 0 ;
-	}
-#Surface pressure
-'surface_air_pressure' = {
-	 discipline = 0 ;
-	 parameterCategory = 3 ;
-	 parameterNumber = 0 ;
-	 typeOfFirstFixedSurface = 1 ;
-	}
-#Vertical velocity
-'lagrangian_tendency_of_air_pressure' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 8 ;
-	}
-#Vorticity (relative)
-'atmosphere_relative_vorticity' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 12 ;
-	}
-#Surface sensible heat flux
-'surface_upward_sensible_heat_flux' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 11 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 typeOfStatisticalProcessing = 1 ;
-	}
-#Surface latent heat flux
-'surface_upward_latent_heat_flux' = {
-	 discipline = 0 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 10 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 typeOfStatisticalProcessing = 1 ;
-	}
-#Mean sea level pressure
-'air_pressure_at_mean_sea_level' = {
-	 discipline = 0 ;
-	 parameterCategory = 3 ;
-	 parameterNumber = 0 ;
-	 typeOfFirstFixedSurface = 101 ;
-	}
-#Divergence
-'divergence_of_wind' = {
-	 discipline = 0 ;
-	 parameterCategory = 2 ;
-	 parameterNumber = 13 ;
-	}
-#Geopotential height
-'geopotential_height' = {
-	 discipline = 0 ;
-	 parameterCategory = 3 ;
-	 parameterNumber = 5 ;
-	}
-#Relative humidity
-'relative_humidity' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 1 ;
-	}
-#Land-sea mask
-'land_binary_mask' = {
-	 discipline = 2 ;
-	 parameterCategory = 0 ;
-	 parameterNumber = 0 ;
-	 typeOfFirstFixedSurface = 1 ;
-	}
-#Surface net short-wave (solar) radiation
-'surface_net_downward_shortwave_flux' = {
-	 discipline = 0 ;
-	 parameterCategory = 4 ;
-	 parameterNumber = 9 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 typeOfStatisticalProcessing = 1 ;
-	}
-#Surface net long-wave (thermal) radiation
-'surface_net_upward_longwave_flux' = {
-	 discipline = 0 ;
-	 parameterCategory = 5 ;
-	 parameterNumber = 5 ;
-	 typeOfFirstFixedSurface = 1 ;
-	 typeOfStatisticalProcessing = 1 ;
-	}
-#Top net long-wave (thermal) radiation
-'toa_outgoing_longwave_flux' = {
-	 discipline = 0 ;
-	 parameterCategory = 5 ;
-	 parameterNumber = 5 ;
-	 typeOfFirstFixedSurface = 8 ;
-	 typeOfStatisticalProcessing = 1 ;
-	}
-#Forecast albedo
-'surface_albedo' = {
-	 discipline = 0 ;
-	 parameterCategory = 19 ;
-	 parameterNumber = 1 ;
-	}
-#Convective precipitation (water)
-'lwe_thickness_of_convective_precipitation_amount' = {
-	 discipline = 0 ;
-	 parameterCategory = 1 ;
-	 parameterNumber = 10 ;
-}