core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Definitions: Final update of cfNames. Now in sync with parameter DB

This commit is contained in:
Shahram Najm 2020-11-22 15:53:44 +00:00
parent e8488e5c36
commit 071210fbc2
5 changed files with 130 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

161
definitions/grib1/cfName.def
View File

@ -80,11 +80,41 @@
table2Version = 3 ; table2Version = 3 ;
indicatorOfParameter = 10 ; 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 #Boundary layer dissipation
'kinetic_energy_dissipation_in_atmosphere_boundary_layer' = { 'kinetic_energy_dissipation_in_atmosphere_boundary_layer' = {
table2Version = 3 ; table2Version = 3 ;
indicatorOfParameter = 123 ; indicatorOfParameter = 123 ;
} }
#Albedo
'surface_albedo' = {
table2Version = 3 ;
indicatorOfParameter = 84 ;
}
#Convective precipitation (water)
'lwe_thickness_of_convective_precipitation_amount' = {
table2Version = 3 ;
indicatorOfParameter = 63 ;
}
#Geopotential #Geopotential
'geopotential' = { 'geopotential' = {
table2Version = 2 ; table2Version = 2 ;
@ -166,11 +196,41 @@
table2Version = 2 ; table2Version = 2 ;
indicatorOfParameter = 10 ; 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 #Boundary layer dissipation
'kinetic_energy_dissipation_in_atmosphere_boundary_layer' = { 'kinetic_energy_dissipation_in_atmosphere_boundary_layer' = {
table2Version = 2 ; table2Version = 2 ;
indicatorOfParameter = 123 ; indicatorOfParameter = 123 ;
} }
#Albedo
'surface_albedo' = {
table2Version = 2 ;
indicatorOfParameter = 84 ;
}
#Convective precipitation (water)
'lwe_thickness_of_convective_precipitation_amount' = {
table2Version = 2 ;
indicatorOfParameter = 63 ;
}
#Geopotential #Geopotential
'geopotential' = { 'geopotential' = {
table2Version = 1 ; table2Version = 1 ;
@ -252,83 +312,38 @@
table2Version = 1 ; table2Version = 1 ;
indicatorOfParameter = 10 ; indicatorOfParameter = 10 ;
} }
#Snow depth
'lwe_thickness_of_surface_snow_amount' = {
table2Version = 1 ;
indicatorOfParameter = 66 ;
}
#Convective cloud cover
'convective_cloud_area_fraction' = {
table2Version = 1 ;
indicatorOfParameter = 72 ;
}
#Latent heat flux
'surface_upward_latent_heat_flux' = {
table2Version = 1 ;
indicatorOfParameter = 121 ;
}
#Sensible heat flux
'surface_upward_sensible_heat_flux' = {
table2Version = 1 ;
indicatorOfParameter = 122 ;
}
#Boundary layer dissipation #Boundary layer dissipation
'kinetic_energy_dissipation_in_atmosphere_boundary_layer' = { 'kinetic_energy_dissipation_in_atmosphere_boundary_layer' = {
table2Version = 1 ; table2Version = 1 ;
indicatorOfParameter = 123 ; indicatorOfParameter = 123 ;
} }
#Vertical velocity (geometric)
'lagrangian_tendency_of_air_pressure' = {
indicatorOfParameter = 40 ;
table2Version = 3 ;
}
#Vertical velocity (geometric)
'lagrangian_tendency_of_air_pressure' = {
indicatorOfParameter = 40 ;
table2Version = 2 ;
}
#Vertical velocity (geometric)
'lagrangian_tendency_of_air_pressure' = {
indicatorOfParameter = 40 ;
table2Version = 1 ;
}
#Surface sensible heat flux
'surface_upward_sensible_heat_flux' = {
indicatorOfParameter = 122 ;
table2Version = 3 ;
}
#Surface sensible heat flux
'surface_upward_sensible_heat_flux' = {
indicatorOfParameter = 122 ;
table2Version = 2 ;
}
#Surface sensible heat flux
'surface_upward_sensible_heat_flux' = {
indicatorOfParameter = 122 ;
table2Version = 1 ;
}
#Surface latent heat flux
'surface_upward_latent_heat_flux' = {
indicatorOfParameter = 121 ;
table2Version = 3 ;
}
#Surface latent heat flux
'surface_upward_latent_heat_flux' = {
indicatorOfParameter = 121 ;
table2Version = 2 ;
}
#Surface latent heat flux
'surface_upward_latent_heat_flux' = {
indicatorOfParameter = 121 ;
table2Version = 1 ;
}
#Albedo #Albedo
'surface_albedo' = { 'surface_albedo' = {
indicatorOfParameter = 84 ; table2Version = 1 ;
table2Version = 3 ; indicatorOfParameter = 84 ;
} }
#Albedo #Convective precipitation (water)
'surface_albedo' = { 'lwe_thickness_of_convective_precipitation_amount' = {
indicatorOfParameter = 84 ; table2Version = 1 ;
table2Version = 2 ; indicatorOfParameter = 63 ;
}
#Albedo
'surface_albedo' = {
indicatorOfParameter = 84 ;
table2Version = 1 ;
}
#Convective cloud cover
'convective_cloud_area_fraction' = {
indicatorOfParameter = 72 ;
table2Version = 3 ;
}
#Convective cloud cover
'convective_cloud_area_fraction' = {
indicatorOfParameter = 72 ;
table2Version = 2 ;
}
#Convective cloud cover
'convective_cloud_area_fraction' = {
indicatorOfParameter = 72 ;
table2Version = 1 ;
} }

26
definitions/grib1/localConcepts/ecmf/cfName.def
View File

@ -170,7 +170,7 @@
indicatorOfParameter = 137 ; indicatorOfParameter = 137 ;
} }
#Total column water vapour #Total column water vapour
'lwe_thickness_of_atmosphere_water_vapor_content' = { 'lwe_thickness_of_atmosphere_mass_content_of_water_vapor' = {
table2Version = 180 ; table2Version = 180 ;
indicatorOfParameter = 137 ; indicatorOfParameter = 137 ;
} }
@ -290,7 +290,7 @@
indicatorOfParameter = 145 ; indicatorOfParameter = 145 ;
} }
#Boundary layer dissipation #Boundary layer dissipation
'dissipation_in_atmosphere_boundary_layer' = { 'kinetic_energy_dissipation_in_atmosphere_boundary_layer' = {
table2Version = 160 ; table2Version = 160 ;
indicatorOfParameter = 145 ; indicatorOfParameter = 145 ;
} }
@ -680,7 +680,7 @@
indicatorOfParameter = 238 ; indicatorOfParameter = 238 ;
} }
#Temperature of snow layer #Temperature of snow layer
'snow_temperature' = { 'temperature_in_surface_snow' = {
table2Version = 160 ; table2Version = 160 ;
indicatorOfParameter = 238 ; indicatorOfParameter = 238 ;
} }
@ -939,6 +939,16 @@
table2Version = 151 ; table2Version = 151 ;
indicatorOfParameter = 147 ; indicatorOfParameter = 147 ;
} }
#Surface downward eastward stress
'surface_downward_eastward_stress' = {
table2Version = 151 ;
indicatorOfParameter = 153 ;
}
#Surface downward northward stress
'surface_downward_northward_stress' = {
table2Version = 151 ;
indicatorOfParameter = 154 ;
}
#Depth of 20C isotherm #Depth of 20C isotherm
'depth_of_isosurface_of_sea_water_potential_temperature' = { 'depth_of_isosurface_of_sea_water_potential_temperature' = {
table2Version = 151 ; table2Version = 151 ;
@ -1029,13 +1039,3 @@
table2Version = 210 ; table2Version = 210 ;
indicatorOfParameter = 206 ; indicatorOfParameter = 206 ;
} }
#Surface downward northward stress
'surface_downward_northward_stress' = {
table2Version = 151 ;
indicatorOfParameter = 154 ;
}
#Surface downward eastward stress
'surface_downward_eastward_stress' = {
table2Version = 151 ;
indicatorOfParameter = 153 ;
}

28
definitions/grib2/cfName.def
View File

@ -55,6 +55,12 @@
typeOfFirstFixedSurface = 1 ; typeOfFirstFixedSurface = 1 ;
typeOfStatisticalProcessing = 1 ; typeOfStatisticalProcessing = 1 ;
} }
#Snow depth
'lwe_thickness_of_surface_snow_amount' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 11 ;
}
#Sea surface practical salinity #Sea surface practical salinity
'sea_surface_salinity' = { 'sea_surface_salinity' = {
discipline = 10 ; discipline = 10 ;
@ -251,16 +257,16 @@
parameterNumber = 5 ; parameterNumber = 5 ;
typeOfFirstFixedSurface = 8 ; typeOfFirstFixedSurface = 8 ;
typeOfStatisticalProcessing = 1 ; typeOfStatisticalProcessing = 1 ;
} }
#Convective precipitation #Albedo
'surface_albedo' = {
discipline = 0 ;
parameterCategory = 19 ;
parameterNumber = 1 ;
}
#Convective precipitation (water)
'lwe_thickness_of_convective_precipitation_amount' = { 'lwe_thickness_of_convective_precipitation_amount' = {
discipline = 0 ; discipline = 0 ;
parameterCategory = 1 ; parameterCategory = 1 ;
parameterNumber = 10 ; parameterNumber = 10 ;
}
#Snow depth
'lwe_thickness_of_surface_snow_amount' = {
discipline = 0 ;
parameterCategory = 1 ;
parameterNumber = 11 ;
} }

24
definitions/grib2/localConcepts/ecmf/cfName.def
View File

@ -529,6 +529,18 @@
parameterCategory = 151 ; parameterCategory = 151 ;
parameterNumber = 147 ; parameterNumber = 147 ;
} }
#Surface downward eastward stress
'surface_downward_eastward_stress' = {
discipline = 192 ;
parameterCategory = 151 ;
parameterNumber = 153 ;
}
#Surface downward northward stress
'surface_downward_northward_stress' = {
discipline = 192 ;
parameterCategory = 151 ;
parameterNumber = 154 ;
}
#Carbon Dioxide #Carbon Dioxide
'mass_fraction_of_carbon_dioxide_in_air' = { 'mass_fraction_of_carbon_dioxide_in_air' = {
discipline = 192 ; discipline = 192 ;
@ -625,15 +637,3 @@
parameterCategory = 210 ; parameterCategory = 210 ;
parameterNumber = 206 ; parameterNumber = 206 ;
} }
#Surface downward northward stress
'surface_downward_northward_stress' = {
discipline = 192 ;
parameterCategory = 151 ;
parameterNumber = 154 ;
}
#Surface downward eastward stress
'surface_downward_eastward_stress' = {
discipline = 192 ;
parameterCategory = 151 ;
parameterNumber = 153 ;
}

3
tests/grib_cfNames.sh
View File

@ -31,9 +31,6 @@ grib_check_key_equals $temp cfName lwe_thickness_of_atmosphere_mass_content_of_w
${tools_dir}/grib_set -s paramId=145 $sample2 $temp ${tools_dir}/grib_set -s paramId=145 $sample2 $temp
grib_check_key_equals $temp cfName kinetic_energy_dissipation_in_atmosphere_boundary_layer grib_check_key_equals $temp cfName kinetic_energy_dissipation_in_atmosphere_boundary_layer
${tools_dir}/grib_set -s indicatorOfParameter=40,table2Version=3 $sample1 $temp
grib_check_key_equals $temp cfName lagrangian_tendency_of_air_pressure
${tools_dir}/grib_set -s indicatorOfParameter=122,table2Version=1 $sample1 $temp ${tools_dir}/grib_set -s indicatorOfParameter=122,table2Version=1 $sample1 $temp
grib_check_key_equals $temp cfName surface_upward_sensible_heat_flux grib_check_key_equals $temp cfName surface_upward_sensible_heat_flux