From 2b5aeb9c83405339dfe259266f8e822bd202489e Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Mon, 16 Nov 2020 21:35:20 +0000 Subject: [PATCH] Definitions: cleanup of cfNames (Related to ECC-1163) --- definitions/grib1/cfName.def | 75 +++++++++++++++++++ .../grib1/localConcepts/ecmf/cfName.def | 22 ++++-- definitions/grib2/cfName.def | 14 +++- .../grib2/localConcepts/ecmf/cfName.def | 18 ++++- 4 files changed, 119 insertions(+), 10 deletions(-) diff --git a/definitions/grib1/cfName.def b/definitions/grib1/cfName.def index 069912892..f342e4b1e 100644 --- a/definitions/grib1/cfName.def +++ b/definitions/grib1/cfName.def @@ -242,3 +242,78 @@ table2Version = 1 ; 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 +'surface_albedo' = { + indicatorOfParameter = 84 ; + table2Version = 3 ; +} +#Albedo +'surface_albedo' = { + indicatorOfParameter = 84 ; + table2Version = 2 ; +} +#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 ; +} diff --git a/definitions/grib1/localConcepts/ecmf/cfName.def b/definitions/grib1/localConcepts/ecmf/cfName.def index 47e311e40..b1c1ad73d 100644 --- a/definitions/grib1/localConcepts/ecmf/cfName.def +++ b/definitions/grib1/localConcepts/ecmf/cfName.def @@ -165,7 +165,7 @@ indicatorOfParameter = 135 ; } #Total column water vapour -'lwe_thickness_of_atmosphere_water_vapor_content' = { +'lwe_thickness_of_atmosphere_mass_content_of_water_vapor' = { table2Version = 128 ; indicatorOfParameter = 137 ; } @@ -245,17 +245,17 @@ indicatorOfParameter = 141 ; } #Large-scale precipitation -'lwe_thickness_of_large_scale_precipitation_amount' = { +'lwe_thickness_of_stratiform_precipitation_amount' = { table2Version = 128 ; indicatorOfParameter = 142 ; } #Large-scale precipitation -'lwe_thickness_of_large_scale_precipitation_amount' = { +'lwe_thickness_of_stratiform_precipitation_amount' = { table2Version = 170 ; indicatorOfParameter = 142 ; } #Large-scale precipitation -'lwe_thickness_of_large_scale_precipitation_amount' = { +'lwe_thickness_of_stratiform_precipitation_amount' = { table2Version = 180 ; indicatorOfParameter = 142 ; } @@ -285,7 +285,7 @@ indicatorOfParameter = 144 ; } #Boundary layer dissipation -'dissipation_in_atmosphere_boundary_layer' = { +'kinetic_energy_dissipation_in_atmosphere_boundary_layer' = { table2Version = 128 ; indicatorOfParameter = 145 ; } @@ -665,7 +665,7 @@ indicatorOfParameter = 211 ; } #Temperature of snow layer -'snow_temperature' = { +'temperature_in_surface_snow' = { table2Version = 128 ; indicatorOfParameter = 238 ; } @@ -729,3 +729,13 @@ table2Version = 174 ; indicatorOfParameter = 98 ; } +#Surface downward northward stress +'surface_downward_northward_stress' = { + table2Version = 151 ; + indicatorOfParameter = 154 ; +} +#Surface downward eastward stress +'surface_downward_eastward_stress' = { + table2Version = 151 ; + indicatorOfParameter = 153 ; +} diff --git a/definitions/grib2/cfName.def b/definitions/grib2/cfName.def index af7fc7a79..b3f264ff4 100644 --- a/definitions/grib2/cfName.def +++ b/definitions/grib2/cfName.def @@ -163,7 +163,7 @@ parameterNumber = 12 ; } #Boundary layer dissipation -'dissipation_in_atmosphere_boundary_layer' = { +'kinetic_energy_dissipation_in_atmosphere_boundary_layer' = { discipline = 0 ; parameterCategory = 2 ; parameterNumber = 20 ; @@ -246,3 +246,15 @@ typeOfFirstFixedSurface = 8 ; typeOfStatisticalProcessing = 1 ; } +#Convective precipitation +'lwe_thickness_of_convective_precipitation_amount' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 10 ; +} +#Snow depth +'lwe_thickness_of_surface_snow_amount' = { + discipline = 0 ; + parameterCategory = 1 ; + parameterNumber = 11 ; +} diff --git a/definitions/grib2/localConcepts/ecmf/cfName.def b/definitions/grib2/localConcepts/ecmf/cfName.def index c75f2bb1b..66180e1ad 100644 --- a/definitions/grib2/localConcepts/ecmf/cfName.def +++ b/definitions/grib2/localConcepts/ecmf/cfName.def @@ -1,6 +1,6 @@ # Automatically generated by create_def.CLEAN.pl, do not edit #Total column water vapour -'lwe_thickness_of_atmosphere_water_vapor_content' = { +'lwe_thickness_of_atmosphere_mass_content_of_water_vapor' = { discipline = 192 ; parameterCategory = 128 ; parameterNumber = 137 ; @@ -25,7 +25,7 @@ parameterNumber = 254 ; } #Large-scale precipitation -'lwe_thickness_of_large_scale_precipitation_amount' = { +'lwe_thickness_of_stratiform_precipitation_amount' = { discipline = 192 ; parameterCategory = 128 ; parameterNumber = 142 ; @@ -74,7 +74,7 @@ parameterNumber = 185 ; } #Temperature of snow layer -'snow_temperature' = { +'temperature_in_surface_snow' = { discipline = 192 ; parameterCategory = 128 ; parameterNumber = 238 ; @@ -109,3 +109,15 @@ parameterCategory = 151 ; parameterNumber = 147 ; } +#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 ; +}