diff --git a/VERSION b/VERSION index 7cca401c7..3afbaeb2b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.32.0 +2.33.0 diff --git a/definitions/grib2/d b/definitions/grib2/d deleted file mode 100644 index 1747c3626..000000000 --- a/definitions/grib2/d +++ /dev/null @@ -1,98 +0,0 @@ -0.0.table -1.0.table -1.1.table -1.2.table -1.3.table -1.4.table -3.0.table -3.1.table -3.10.table -3.11.table -3.15.table -3.2.table -3.20.table -3.21.table -3.3.table -3.4.table -3.5.table -3.6.table -3.7.table -3.8.table -3.9.table -4.0.table -4.1.0.table -4.1.1.table -4.1.10.table -4.1.2.table -4.1.3.table -4.1.table -4.10.table -4.11.table -4.12.table -4.13.table -4.14.table -4.2.0.0.table -4.2.0.1.table -4.2.0.13.table -4.2.0.14.table -4.2.0.15.table -4.2.0.18.table -4.2.0.19.table -4.2.0.190.table -4.2.0.191.table -4.2.0.2.table -4.2.0.3.table -4.2.0.4.table -4.2.0.5.table -4.2.0.6.table -4.2.0.7.table -4.2.1.0.table -4.2.1.1.table -4.2.10.0.table -4.2.10.1.table -4.2.10.2.table -4.2.10.3.table -4.2.10.4.table -4.2.2.0.table -4.2.2.3.table -4.2.3.0.table -4.2.3.1.table -4.2.table -4.201.table -4.202.table -4.203.table -4.204.table -4.205.table -4.206.table -4.207.table -4.208.table -4.209.table -4.210.table -4.211.table -4.212.table -4.213.table -4.215.table -4.216.table -4.217.table -4.220.table -4.221.table -4.3.table -4.4.table -4.5.table -4.6.table -4.7.table -4.8.table -4.9.table -5.0.table -5.1.table -5.2.table -5.3.table -5.4.table -5.40.table -5.40000.table -5.5.table -5.6.table -5.7.table -5.8.table -5.9.table -6.0.table diff --git a/definitions/grib2/localConcepts/ecmf/unstructuredGridSubtype.def b/definitions/grib2/localConcepts/ecmf/unstructuredGridSubtype.def index 3f93215f3..926277b83 100644 --- a/definitions/grib2/localConcepts/ecmf/unstructuredGridSubtype.def +++ b/definitions/grib2/localConcepts/ecmf/unstructuredGridSubtype.def @@ -4,3 +4,5 @@ 'V' = { numberOfGridInReference = 3; } 'W' = { numberOfGridInReference = 4; } 'F' = { numberOfGridInReference = 5; } +'E' = { numberOfGridInReference = 6; } +'N' = { numberOfGridInReference = 7; } diff --git a/definitions/grib2/localConcepts/ecmf/unstructuredGridType.def b/definitions/grib2/localConcepts/ecmf/unstructuredGridType.def index 33dcb3cac..dfcc93e2f 100644 --- a/definitions/grib2/localConcepts/ecmf/unstructuredGridType.def +++ b/definitions/grib2/localConcepts/ecmf/unstructuredGridType.def @@ -6,3 +6,5 @@ 'eORCA1' = { numberOfGridUsed = 5; } 'eORCA025' = { numberOfGridUsed = 6; } 'eORCA12' = { numberOfGridUsed = 7; } +'CORE2' = { numberOfGridUsed = 8; } +'NG5' = { numberOfGridUsed = 9; } diff --git a/definitions/grib2/ls.def b/definitions/grib2/ls.def deleted file mode 100644 index 139597f9c..000000000 --- a/definitions/grib2/ls.def +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/definitions/grib2/meta.def b/definitions/grib2/meta.def deleted file mode 100644 index baa49b8f2..000000000 --- a/definitions/grib2/meta.def +++ /dev/null @@ -1,5 +0,0 @@ -# (C) Copyright 2005- ECMWF. - -label "_Empty file"; - -#meta area g1area(latitudeOfFirstGridPoint,longitudeOfFirstGridPoint,latitudeOfLastGridPoint,longitudeOfLastGridPoint,angleMultiplier,angleDivisor); diff --git a/definitions/grib2/rules.def b/definitions/grib2/rules.def deleted file mode 100644 index c1f74af5d..000000000 --- a/definitions/grib2/rules.def +++ /dev/null @@ -1,12 +0,0 @@ -# (C) Copyright 2005- ECMWF. - -# Experimental stuff - -transient isAccumulation = 0 ; -transient isEPS = 0 ; - -when(isAccumulation and !isEPS) - set productDefinitionTemplateNumber = 8; - -when(isAccumulation and isEPS) - set productDefinitionTemplateNumber = 11; diff --git a/definitions/grib2/template.4.horizontal.def b/definitions/grib2/template.4.horizontal.def index e5a45721a..67a1909da 100644 --- a/definitions/grib2/template.4.horizontal.def +++ b/definitions/grib2/template.4.horizontal.def @@ -75,7 +75,7 @@ if (extraDim) { } } # ECC-1333: levtype should be read-only in GRIB2 - concept mars.levtype(unknown,"marsLevtypeConcept.def",conceptsDir2,conceptsDir1):no_copy; + concept mars.levtype(unknown,"marsLevtypeConcept.def",conceptsDir2,conceptsDir1):no_copy, read_only; # GRIB-372: levelist alias does not pertain to surface parameters if (levtype is "sfc" || levtype is "o2d") { unalias mars.levelist; diff --git a/definitions/grib2/tigge_name.def b/definitions/grib2/tigge_name.def deleted file mode 100644 index 76fbb84b5..000000000 --- a/definitions/grib2/tigge_name.def +++ /dev/null @@ -1,45 +0,0 @@ -# Automatically generated by ./tigge_def.pl, do not edit - - '10_meter_u_velocity' = { parameter = 165; } - '10_meter_v_velocity' = { parameter = 166; } - '10_metre_wind_gust_of_at_least_15_m/s' = { parameter = 131070; } - '10_metre_wind_gust_of_at_least_25_m/s' = { parameter = 131071; } - 'convective_available_potential_energy' = { parameter = 59; } - 'convective_inhibition' = { parameter = 228001; } - 'field_capacity' = { parameter = 228170; } - 'geopotential_height' = { parameter = 156; } - 'land_sea_mask' = { parameter = 172; } - 'maximum_wind_gust' = { parameter = 49; } - 'mean_sea_level_pressure' = { parameter = 151; } - 'orography' = { parameter = 228002; } - 'potential_temperature' = { parameter = 3; } - 'potential_vorticity' = { parameter = 60; } - 'sea_surface_temperature_anomaly' = { parameter = 171034; } - 'skin_temperature' = { parameter = 235; } - 'snow_depth_water_equivalent' = { parameter = 228141; } - 'snow_fall_water_equivalent' = { parameter = 228144; } - 'soil_moisture' = { parameter = 228039; } - 'soil_temperature' = { parameter = 228139; } - 'specific_humidity' = { parameter = 133; } - 'sunshine_duration' = { parameter = 189; } - 'surface_air_dew_point_temperature' = { parameter = 168; } - 'surface_air_maximum_temperature' = { parameter = 121; } - 'surface_air_minimum_temperature' = { parameter = 122; } - 'surface_air_temperature' = { parameter = 167; } - 'surface_pressure' = { parameter = 134; } - 'temperature' = { parameter = 130; } - 'time_integrated_outgoing_long_wave_radiation' = { parameter = 179; } - 'time_integrated_surface_latent_heat_flux' = { parameter = 147; } - 'time_integrated_surface_net_solar_radiation' = { parameter = 176; } - 'time_integrated_surface_net_thermal_radiation' = { parameter = 177; } - 'time_integrated_surface_sensible_heat_flux' = { parameter = 146; } - 'total_cloud_cover' = { parameter = 228164; } - 'total_column_water' = { parameter = 136; } - 'total_precipitation' = { parameter = 228228; } - 'total_precipitation_of_at_least_10_mm' = { parameter = 131062; } - 'total_precipitation_of_at_least_20_mm' = { parameter = 131063; } - 'u_velocity' = { parameter = 131; } - 'v_velocity' = { parameter = 132; } - 'wilting_point' = { parameter = 228171; } - 'default' = { parameter = 99999; } - diff --git a/definitions/grib2/tigge_parameter.def b/definitions/grib2/tigge_parameter.def deleted file mode 100644 index 3ded0bb12..000000000 --- a/definitions/grib2/tigge_parameter.def +++ /dev/null @@ -1,395 +0,0 @@ -# Automatically generated by ./tigge_def.pl, do not edit - -# 10_meter_u_velocity -'165' = { - discipline = 0; - parameterCategory = 2; - parameterNumber = 2; - scaleFactorOfFirstFixedSurface = 0; - scaledValueOfFirstFixedSurface = 10; - typeOfFirstFixedSurface = 103; -} - -# 10_meter_v_velocity -'166' = { - discipline = 0; - parameterCategory = 2; - parameterNumber = 3; - scaleFactorOfFirstFixedSurface = 0; - scaledValueOfFirstFixedSurface = 10; - typeOfFirstFixedSurface = 103; -} - -# 10_metre_wind_gust_of_at_least_15_m/s -'131070' = { - discipline = 0; - parameterCategory = 2; - parameterNumber = 22; - productDefinitionTemplateNumber = 9; - scaleFactorOfFirstFixedSurface = 0; - scaledValueOfFirstFixedSurface = 10; - scaledValueOfLowerLimit = 15; - typeOfFirstFixedSurface = 103; - typeOfStatisticalProcessing = 2; -} - -# 10_metre_wind_gust_of_at_least_25_m/s -'131071' = { - discipline = 0; - parameterCategory = 2; - parameterNumber = 22; - productDefinitionTemplateNumber = 9; - scaleFactorOfFirstFixedSurface = 0; - scaledValueOfFirstFixedSurface = 10; - scaledValueOfLowerLimit = 25; - typeOfFirstFixedSurface = 103; - typeOfStatisticalProcessing = 2; -} - -# convective_available_potential_energy -'59' = { - discipline = 0; - parameterCategory = 7; - parameterNumber = 6; - typeOfFirstFixedSurface = 1; - typeOfSecondFixedSurface = 8; -} - -# convective_inhibition -'228001' = { - discipline = 0; - parameterCategory = 7; - parameterNumber = 7; - typeOfFirstFixedSurface = 1; - typeOfSecondFixedSurface = 8; -} - -# field_capacity -'228170' = { - discipline = 2; - parameterCategory = 3; - parameterNumber = 12; - scaleFactorOfFirstFixedSurface = 0; - scaleFactorOfSecondFixedSurface = 1; - scaledValueOfFirstFixedSurface = 0; - scaledValueOfSecondFixedSurface = 2; - typeOfFirstFixedSurface = 106; - typeOfSecondFixedSurface = 106; -} - -# geopotential_height -'156' = { - discipline = 0; - parameterCategory = 3; - parameterNumber = 5; - typeOfFirstFixedSurface = 100; -} - -# land_sea_mask -'172' = { - discipline = 2; - parameterCategory = 0; - parameterNumber = 0; - typeOfFirstFixedSurface = 1; -} - -# maximum_wind_gust -'49' = { - discipline = 0; - parameterCategory = 2; - parameterNumber = 22; - scaleFactorOfFirstFixedSurface = 0; - scaledValueOfFirstFixedSurface = 10; - typeOfFirstFixedSurface = 103; - typeOfStatisticalProcessing = 2; -} - -# mean_sea_level_pressure -'151' = { - discipline = 0; - parameterCategory = 3; - parameterNumber = 0; - typeOfFirstFixedSurface = 101; -} - -# orography -'228002' = { - discipline = 0; - parameterCategory = 3; - parameterNumber = 5; - typeOfFirstFixedSurface = 1; -} - -# potential_temperature -'3' = { - discipline = 0; - parameterCategory = 0; - parameterNumber = 2; - scaleFactorOfFirstFixedSurface = 6; - scaledValueOfFirstFixedSurface = 2; - typeOfFirstFixedSurface = 109; -} - -# potential_vorticity -'60' = { - discipline = 0; - parameterCategory = 2; - parameterNumber = 14; - scaleFactorOfFirstFixedSurface = 0; - scaledValueOfFirstFixedSurface = 320; - typeOfFirstFixedSurface = 107; -} - -# sea_surface_temperature_anomaly -'171034' = { - discipline = 0; - parameterCategory = 0; - parameterNumber = 9; - typeOfFirstFixedSurface = 1; -} - -# skin_temperature -'235' = { - discipline = 0; - parameterCategory = 0; - parameterNumber = 17; - typeOfFirstFixedSurface = 1; -} - -# snow_depth_water_equivalent -'228141' = { - discipline = 0; - parameterCategory = 1; - parameterNumber = 60; - typeOfFirstFixedSurface = 1; -} - -# snow_fall_water_equivalent -'228144' = { - discipline = 0; - parameterCategory = 1; - parameterNumber = 53; - typeOfFirstFixedSurface = 1; - typeOfStatisticalProcessing = 1; -} - -# soil_moisture -'228039' = { - discipline = 2; - parameterCategory = 0; - parameterNumber = 22; - scaleFactorOfFirstFixedSurface = 0; - scaleFactorOfSecondFixedSurface = 1; - scaledValueOfFirstFixedSurface = 0; - scaledValueOfSecondFixedSurface = 2; - typeOfFirstFixedSurface = 106; - typeOfSecondFixedSurface = 106; -} - -# soil_temperature -'228139' = { - discipline = 2; - parameterCategory = 0; - parameterNumber = 2; - scaleFactorOfFirstFixedSurface = 0; - scaleFactorOfSecondFixedSurface = 1; - scaledValueOfFirstFixedSurface = 0; - scaledValueOfSecondFixedSurface = 2; - typeOfFirstFixedSurface = 106; - typeOfSecondFixedSurface = 106; -} - -# specific_humidity -'133' = { - discipline = 0; - parameterCategory = 1; - parameterNumber = 0; - typeOfFirstFixedSurface = 100; -} - -# sunshine_duration -'189' = { - discipline = 0; - parameterCategory = 6; - parameterNumber = 24; - typeOfFirstFixedSurface = 1; - typeOfStatisticalProcessing = 1; -} - -# surface_air_dew_point_temperature -'168' = { - discipline = 0; - parameterCategory = 0; - parameterNumber = 6; - typeOfFirstFixedSurface = 103; -} - -# surface_air_maximum_temperature -'121' = { - discipline = 0; - parameterCategory = 0; - parameterNumber = 0; - typeOfFirstFixedSurface = 103; - typeOfStatisticalProcessing = 2; -} - -# surface_air_minimum_temperature -'122' = { - discipline = 0; - parameterCategory = 0; - parameterNumber = 0; - typeOfFirstFixedSurface = 103; - typeOfStatisticalProcessing = 3; -} - -# surface_air_temperature -'167' = { - discipline = 0; - parameterCategory = 0; - parameterNumber = 0; - typeOfFirstFixedSurface = 103; -} - -# surface_pressure -'134' = { - discipline = 0; - parameterCategory = 3; - parameterNumber = 0; - typeOfFirstFixedSurface = 1; -} - -# temperature -'130' = { - discipline = 0; - parameterCategory = 0; - parameterNumber = 0; - typeOfFirstFixedSurface = 100; -} - -# time_integrated_outgoing_long_wave_radiation -'179' = { - discipline = 0; - parameterCategory = 5; - parameterNumber = 5; - typeOfFirstFixedSurface = 8; - typeOfStatisticalProcessing = 1; -} - -# time_integrated_surface_latent_heat_flux -'147' = { - discipline = 0; - parameterCategory = 0; - parameterNumber = 10; - typeOfFirstFixedSurface = 1; - typeOfStatisticalProcessing = 1; -} - -# time_integrated_surface_net_solar_radiation -'176' = { - discipline = 0; - parameterCategory = 4; - parameterNumber = 9; - typeOfFirstFixedSurface = 1; - typeOfStatisticalProcessing = 1; -} - -# time_integrated_surface_net_thermal_radiation -'177' = { - discipline = 0; - parameterCategory = 5; - parameterNumber = 5; - typeOfFirstFixedSurface = 1; - typeOfStatisticalProcessing = 1; -} - -# time_integrated_surface_sensible_heat_flux -'146' = { - discipline = 0; - parameterCategory = 0; - parameterNumber = 11; - typeOfFirstFixedSurface = 1; - typeOfStatisticalProcessing = 1; -} - -# total_cloud_cover -'228164' = { - discipline = 0; - parameterCategory = 6; - parameterNumber = 1; - typeOfFirstFixedSurface = 1; - typeOfSecondFixedSurface = 8; -} - -# total_column_water -'136' = { - discipline = 0; - parameterCategory = 1; - parameterNumber = 51; - typeOfFirstFixedSurface = 1; - typeOfSecondFixedSurface = 8; -} - -# total_precipitation -'228228' = { - discipline = 0; - parameterCategory = 1; - parameterNumber = 52; - typeOfFirstFixedSurface = 1; - typeOfStatisticalProcessing = 1; -} - -# total_precipitation_of_at_least_10_mm -'131062' = { - discipline = 0; - parameterCategory = 1; - parameterNumber = 52; - productDefinitionTemplateNumber = 9; - scaledValueOfLowerLimit = 10; - typeOfFirstFixedSurface = 1; - typeOfStatisticalProcessing = 1; -} - -# total_precipitation_of_at_least_20_mm -'131063' = { - discipline = 0; - parameterCategory = 1; - parameterNumber = 52; - productDefinitionTemplateNumber = 9; - scaledValueOfLowerLimit = 20; - typeOfFirstFixedSurface = 1; - typeOfStatisticalProcessing = 1; -} - -# u_velocity -'131' = { - discipline = 0; - parameterCategory = 2; - parameterNumber = 2; -} - -# unknown -'default' = { - discipline = 0; - parameterCategory = 0; - parameterNumber = 0; -} - -# v_velocity -'132' = { - discipline = 0; - parameterCategory = 2; - parameterNumber = 3; -} - -# wilting_point -'228171' = { - discipline = 2; - parameterCategory = 0; - parameterNumber = 26; - scaleFactorOfFirstFixedSurface = 0; - scaleFactorOfSecondFixedSurface = 1; - scaledValueOfFirstFixedSurface = 0; - scaledValueOfSecondFixedSurface = 2; - typeOfFirstFixedSurface = 106; - typeOfSecondFixedSurface = 106; -} diff --git a/definitions/grib2/tigge_short_name.def b/definitions/grib2/tigge_short_name.def deleted file mode 100644 index 42ef5c6ea..000000000 --- a/definitions/grib2/tigge_short_name.def +++ /dev/null @@ -1,44 +0,0 @@ -# Automatically generated by ./tigge_def.pl, do not edit - - '10fgg25' = { parameter = 131071; } - '10fgg15' = { parameter = 131070; } - '10v' = { parameter = 166; } - '10u' = { parameter = 165; } - '10u' = { parameter = 49; } - 'ci' = { parameter = 228001; } - 'cap' = { parameter = 228170; } - 'cape' = { parameter = 59; } - 'gh' = { parameter = 156; } - 'lsm' = { parameter = 172; } - 'msl' = { parameter = 151; } - 'orog' = { parameter = 228002; } - 'sd' = { parameter = 228141; } - 'mx2t6' = { parameter = 121; } - '2d' = { parameter = 168; } - 'pv' = { parameter = 60; } - 'pt' = { parameter = 3; } - 'sf' = { parameter = 228144; } - 'skt' = { parameter = 235; } - 'sm' = { parameter = 228039; } - 'str' = { parameter = 177; } - 'sund' = { parameter = 189; } - 'mn2t6' = { parameter = 122; } - 'q' = { parameter = 133; } - 'ssta' = { parameter = 171034; } - '2t' = { parameter = 167; } - 'tcw' = { parameter = 136; } - 'slhf' = { parameter = 147; } - 'st' = { parameter = 228139; } - 'sshf' = { parameter = 146; } - 'sp' = { parameter = 134; } - 't' = { parameter = 130; } - 'tcc' = { parameter = 228164; } - 'ssr' = { parameter = 176; } - 'tpg10' = { parameter = 131062; } - 'tpg20' = { parameter = 131063; } - 'ttr' = { parameter = 179; } - 'tp' = { parameter = 228228; } - 'u' = { parameter = 131; } - 'v' = { parameter = 132; } - 'wilt' = { parameter = 228171; } - 'default' = { parameter = 99999; }