Merge release/2.36.0 to master

Author: shahramn

.github/workflows/ci.yml

@@ -27,6 +27,7 @@ jobs:
     uses: ecmwf-actions/downstream-ci/.github/workflows/downstream-ci.yml@main
     with:
       eccodes: ecmwf/eccodes@${{ github.event.pull_request.head.sha || github.sha }}
+      codecov_upload: true
     secrets: inherit
 
   # Run CI of private downstream packages on self-hosted runners
@@ -74,24 +75,14 @@ jobs:
           event_type: downstream-ci-hpc
           payload: '{"eccodes": "ecmwf/eccodes@${{ github.event.pull_request.head.sha || github.sha }}"}'
 
-  codecov:
-    name: code-coverage
-    if: ${{ !github.event.pull_request.head.repo.fork && github.event.action != 'labeled' || github.event.label.name == 'approved-for-ci' }}
-    uses: ./.github/workflows/reusable-ci.yml
-    with:
-      eccodes: ecmwf/eccodes@${{ github.event.pull_request.head.sha || github.sha }}
-      codecov: true
-    secrets: inherit
-
   notify:
     runs-on: ubuntu-latest
     needs:
       - downstream-ci
       - private-downstream-ci
       - downstream-ci-hpc
       - private-downstream-ci-hpc
-      - codecov
-    if: always() && ${{ !github.event.pull_request.head.repo.fork && github.event.action != 'labeled' || github.event.label.name == 'approved-for-ci' }}
+    if: ${{ always() && !github.event.pull_request.head.repo.fork && github.event.action != 'labeled' || github.event.label.name == 'approved-for-ci' }}
     steps:
       - name: Trigger Teams notification
         uses: ecmwf-actions/notify-teams@v1

.gitignore

@@ -17,6 +17,8 @@ grib_api.pc
 grib_api_f90.pc
 *.analyzerinfo
 *.snalyzerinfo
+tags
+src/convert_*.sh
 
 # compiled source #
 ###################
@@ -72,3 +74,4 @@ data/bufr/*test
 
 build/
 *.back
+trash

VERSION

@@ -1 +1 @@
-2.35.3
+2.36.0

definitions/bufr/section.1.3.def

@@ -20,7 +20,8 @@ unsigned[1] localTablesVersionNumber : dump;
 transient typicalCentury=21;
 
 unsigned[1] typicalYearOfCentury : dump;
-transient typicalYear = (typicalCentury - 1) * 100 + typicalYearOfCentury : no_copy;
+# ECC-1840: Use the 'evaluate' accessor so typicalYear is updated if user changes typicalCentury
+meta typicalYear evaluate( (typicalCentury - 1) * 100 + typicalYearOfCentury ) : no_copy;
 
 unsigned[1] typicalMonth : dump;
 unsigned[1] typicalDay : dump;

definitions/check_grib_defs.pl

@@ -204,6 +204,7 @@ sub process {
         }
         elsif ($this =~ /'(.*)' *= *{/) {
             $concept = $1;
+            die "File: $filename, line: $lineNum: Value is empty." if ($concept eq '');
             die "File: $filename, line: $lineNum: Value contains invalid characters." if (non_printable($concept));
             if ($filename eq 'cfVarName.def') {
                #if ($concept =~ /^[0-9]/) {

definitions/common/c-1.table

@@ -64,7 +64,7 @@
 96 96 Athens
 97 97 European Space Agency (ESA)
 98 ecmf European Centre for Medium-Range Weather Forecasts
-99 99 DeBilt, Netherlands
+99 knmi DeBilt, Netherlands
 110 110 Hong-Kong
 160 160 US NOAA/NESDIS
 173 nasa US National Aeronautics and Space Administration (NASA)
@@ -84,10 +84,10 @@
 233 eidb Dublin
 235 ingv INGV
 239 crfc CERFAX
-244 vuwien VUWien
-245 knmi KNMI
-246 ifmk IfM-Kiel
-247 hadc Hadley Centre
+244 244 The former Yugoslav Republic of Macedonia (NMC)
+245 245 Ukraine (NMC)
+246 246 Republic of Moldova (NMC)
+247 247 Operational Programme for the Exchange of weather RAdar information (OPERA) - EUMETNET
 250 cosmo COnsortium for Small scale MOdelling (COSMO)
 251 251 Meteorological Cooperation on Operational NWP (MetCoOp)
 252 mpim Max Planck Institute for Meteorology (MPI-M)

definitions/common/c-11.table

@@ -23,6 +23,7 @@
 22 22 ACMAD
 23 23 Mozambique (NMC)
 24 fapr Pretoria (RSMC)
+25 25 La Reunion (RSMC)
 26 26 Khabarovsk (RSMC)
 28 vabb New Delhi (IMD)
 29 dems New Delhi (NCMRWF)
@@ -58,12 +59,14 @@
 64 64 Honolulu
 65 65 Darwin (RSMC)
 67 67 Melbourne (RSMC)
+# 68 Reserved
 69 nzkl Wellington (RSMC/RAFC)
 71 71 Nadi (RSMC)
 72 72 Singapore
 73 73 Malaysia (NMC)
 74 egrr U.K. Met Office - Exeter
 76 76 Moscow (RSMC/RAFC)
+# 77 Reserved
 78 edzw Offenbach (RSMC)
 80 cnmc Rome (RSMC)
 82 eswi Norrkoping
@@ -82,7 +85,7 @@
 96 96 Athens
 97 97 European Space Agency (ESA)
 98 ecmf European Centre for Medium-Range Weather Forecasts
-99 99 DeBilt, Netherlands
+99 knmi DeBilt, Netherlands
 100 100 Brazzaville
 101 101 Abidjan
 102 102 Libya (NMC)
@@ -93,15 +96,68 @@
 107 107 Uganda (NMC)
 108 108 United Republic of Tanzania (NMC)
 109 109 Zimbabwe (NMC)
-110 110 Hong-Kong
+110 110 Hong Kong
+111 111 Afghanistan (NMC)
+112 112 Bahrain (NMC)
+113 113 Bangladesh (NMC)
+114 114 Bhutan (NMC)
+115 115 Cambodia (NMC)
+116 116 Democratic People's Republic of Korea (NMC)
+117 117 Islamic Republic of Iran (NMC)
+118 118 Iraq (NMC)
+119 119 Kazakhstan (NMC)
+120 120 Kuwait (NMC)
+121 121 Kyrgyzstan (NMC)
+122 122 Lao People's Democratic Republic (NMC)
+123 123 "Macao  China"
+124 124 Maldives (NMC)
+125 125 Myanmar (NMC)
+126 126 Nepal (NMC)
+127 127 Oman (NMC)
+128 128 Pakistan (NMC)
+129 129 Qatar (NMC)
+130 130 Yemen (NMC)
+131 131 Sri Lanka (NMC)
+132 132 Tajikistan (NMC)
+133 133 Turkmenistan (NMC)
+134 134 United Arab Emirates (NMC)
+135 135 Uzbekistan (NMC)
+136 136 Viet Nam (NMC)
+# 137-139 Reserved for other centres
+140 140 Bolivia (Plurinational State of) (NMC)
+141 141 Guyana (NMC)
+142 142 Paraguay (NMC)
+143 143 Suriname (NMC)
+144 144 Uruguay (NMC)
 145 145 French Guiana
 146 146 Brazilian Navy Hydrographic Centre
 147 147 National Commission on Space Activities (CONAE) - Argentina
 148 148 Brazilian Department of Airspace Control - DECEA
+# 149 Reserved for other centres
+150 150 Antigua and Barbuda (NMC)
+151 151 Bahamas (NMC)
+152 152 Barbados (NMC)
+153 153 Belize (NMC)
+154 154 British Caribbean Territories Centre
+155 155 San Jose
+156 156 Cuba (NMC)
+157 157 Dominica (NMC)
+158 158 Dominican Republic (NMC)
+159 159 El Salvador (NMC)
 160 160 US NOAA/NESDIS
 161 161 US NOAA Office of Oceanic and Atmospheric Research
+162 162 Guatemala (NMC)
+163 163 Haiti (NMC)
+164 164 Honduras (NMC)
+165 165 Jamaica (NMC)
+166 166 Mexico
+167 167 Curacao and Sint Maarten (NMC)
+168 168 Nicaragua (NMC)
+169 169 Panama (NMC)
+170 170 Saint Lucia (NMC)
+171 171 Trinidad and Tobago (NMC)
+172 172 French Departments in RA IV
 173 nasa US National Aeronautics and Space Administration (NASA)
-
 174 174 Integrated Science Data Management/Marine Environmental Data Service (ISDM/MEDS - Canada)
 175 175 University Corporation for Atmospheric Research (UCAR) - United States
 176 176 Cooperative Institute for Meteorological Satellite Studies (CIMSS) - United States
@@ -110,9 +166,23 @@
 179 179 GeoOptics, Inc.
 180 180 PlanetiQ
 181 181 Atmospheric and Environmental Research (AER)
-
+# 182-189 Reserved for other centres
+190 190 Cook Islands (NMC)
+191 191 French Polynesia (NMC)
+192 192 Tonga (NMC)
+193 193 Vanuatu (NMC)
+194 194 Brunei Darussalam (NMC)
 195 wiix Indonesia (NMC)
+196 196 Kiribati (NMC)
+197 197 Federated States of Micronesia (NMC)
+198 198 New Caledonia (NMC)
+199 199 Niue
+200 200 Papua New Guinea (NMC)
+201 201 Philippines (NMC)
+202 202 Samoa (NMC)
+203 203 Solomon Islands (NMC)
 204 niwa  National Institute of Water and Atmospheric Research (NIWA - New Zealand)
+# 205-209 Reserved for other centres
 210 210  Frascati (ESA/ESRIN)
 211 211  Lannion
 212 212  Lisboa
@@ -139,18 +209,24 @@
 233 eidb Dublin
 234 234 Israel (NMC)
 235 ingv INGV
+236 236 Latvia (NMC)
+237 237 Lebanon (NMC)
 238 238 Lithuania (NMC)
 239 crfc CERFAX
 240 240 Malta (NMC)
 241 241 Monaco
 242 242 Romania (NMC)
-244 vuwien VUWien
-245 knmi KNMI
-246 ifmk IfM-Kiel
-247 hadc Hadley Centre
+243 243 Syrian Arab Republic (NMC)
+244 244 The former Yugoslav Republic of Macedonia (NMC)
+245 245 Ukraine (NMC)
+246 246 Republic of Moldova (NMC)
+247 247 Operational Programme for the Exchange of weather RAdar information (OPERA) - EUMETNET
+248 248 Montenegro (NMC)
+249 249 Barcelona Dust Forecast Center
 250 cosmo COnsortium for Small scale MOdelling (COSMO)
 251 251 Meteorological Cooperation on Operational NWP (MetCoOp)
 252 mpim Max Planck Institute for Meteorology (MPI-M)
+253 253 Alfred Wegener Institute (AWI)
 254 eums EUMETSAT Operation Centre
 255 consensus Consensus
 256 256 Angola (NMC)
@@ -184,9 +260,10 @@
 284 284 Sierra Leone (NMC)
 285 285 Somalia (NMC)
 286 286 Sudan (NMC)
-287 287 Swaziland (NMC)
+287 287 Eswatini (NMC)
 288 288 Togo (NMC)
 289 289 Zambia (NMC)
+290 290 EUMETNET E-Profile
 291 anso Alliance of International Science Organizations (Beijing, China)
 292 ufz Helmholtz Centre for Environmental Research
 293 293 University of Bremen
@@ -196,4 +273,28 @@
 297 297 The Nanjing Institute of Environmental Sciences (NIES)
 298 298 Dynamic Meteorology Laboratory (LMD)
 299 299 The Rutherford Appleton Laboratory (RAL)
+300 300 Greek Atomic Energy Commission (Greece)
+301 301 United Stated Environmental Protection Agency (USA)
+302 302 Autralian Radiation Protection and Nuclear Safety (Australia)
+303 303 Authority for Nuclear Safety and Radiation Protection (The Netherlands)
+304 304 Autorite de Surete Nucleaire (France)
+305 305 Bundesamt für Strahlenschutz (Germany)
+306 306 National Commission for Nuclear Activities Control (Romania)
+307 307 Consejo de Seguridad Nuclear (Spain)
+308 308 Danish Emergency Management Agency (Denmark)
+309 309 Norwegian Radiation Protection Agency (Norway)
+310 310 Federal Agency for Nuclear Control (Belgium)
+311 311 Institute of Radiation Protection and Dosimetry (Brazil)
+312 312 National Inspectorate for Nuclear Safety and Radiation Protection (Italy)
+313 313 Nuclear Regulatory Authority (Turkiye)
+314 314 Nuclear Regulation Authority (Japan)
+315 315 Nuclear Regulatory Agency (Bulgaria)
+316 316 Ukrainian Radiation Protection Institute (Ukriane)
+317 317 Health Canada Radio Protection Bureau (Canada)
+318 318 Portuguese Society for Radiation Protection (Portugal)
+319 319 Swedish Radiation Safety Authority (Sweden)
+320 320 Radiation and Nuclear Safety Authority (Finland)
+321 321 State Office for Nuclear Safety (Czechia)
+322 322 Nuclear Regulation Authority (Slovakia)
+# 323-65534 Reserved for other centres
 65535 65535 Missing value

definitions/grib1/cfVarName.def

@@ -1148,36 +1148,6 @@
 	 table2Version = 1 ;
 	 indicatorOfParameter = 48 ;
 	}
-#U-component of current
-'ucurr' = {
-	 table2Version = 3 ;
-	 indicatorOfParameter = 49 ;
-	}
-#U-component of current
-'ucurr' = {
-	 table2Version = 2 ;
-	 indicatorOfParameter = 49 ;
-	}
-#U-component of current
-'ucurr' = {
-	 table2Version = 1 ;
-	 indicatorOfParameter = 49 ;
-	}
-#V-component of current
-'vcurr' = {
-	 table2Version = 3 ;
-	 indicatorOfParameter = 50 ;
-	}
-#V-component of current
-'vcurr' = {
-	 table2Version = 2 ;
-	 indicatorOfParameter = 50 ;
-	}
-#V-component of current
-'vcurr' = {
-	 table2Version = 1 ;
-	 indicatorOfParameter = 50 ;
-	}
 #Humidity mixing ratio
 'mixr' = {
 	 table2Version = 3 ;

definitions/grib1/localConcepts/ecmf/cfName.def

@@ -909,12 +909,12 @@
 	 table2Version = 151 ;
 	 indicatorOfParameter = 130 ;
 	}
-#Eastward sea water velocity
+#Eastward surface sea water velocity
 'eastward_sea_water_velocity' = {
 	 table2Version = 151 ;
 	 indicatorOfParameter = 131 ;
 	}
-#Northward sea water velocity
+#Northward surface sea water velocity
 'northward_sea_water_velocity' = {
 	 table2Version = 151 ;
 	 indicatorOfParameter = 132 ;

definitions/grib1/localConcepts/ecmf/cfVarName.def

@@ -13024,12 +13024,12 @@
 	 table2Version = 151 ;
 	 indicatorOfParameter = 130 ;
 	}
-#Eastward sea water velocity
+#Eastward surface sea water velocity
 'uoe' = {
 	 table2Version = 151 ;
 	 indicatorOfParameter = 131 ;
 	}
-#Northward sea water velocity
+#Northward surface sea water velocity
 'von' = {
 	 table2Version = 151 ;
 	 indicatorOfParameter = 132 ;
@@ -13244,7 +13244,7 @@
 	 table2Version = 151 ;
 	 indicatorOfParameter = 174 ;
 	}
-#Average salinity in the upper 300m
+#Average sea water practical salinity in the upper 300m
 'sav300' = {
 	 table2Version = 151 ;
 	 indicatorOfParameter = 175 ;

definitions/grib1/localConcepts/ecmf/name.def

@@ -13024,13 +13024,13 @@
 	 table2Version = 151 ;
 	 indicatorOfParameter = 130 ;
 	}
-#Eastward sea water velocity
-'Eastward sea water velocity' = {
+#Eastward surface sea water velocity
+'Eastward surface sea water velocity' = {
 	 table2Version = 151 ;
 	 indicatorOfParameter = 131 ;
 	}
-#Northward sea water velocity
-'Northward sea water velocity' = {
+#Northward surface sea water velocity
+'Northward surface sea water velocity' = {
 	 table2Version = 151 ;
 	 indicatorOfParameter = 132 ;
 	}
@@ -13244,8 +13244,8 @@
 	 table2Version = 151 ;
 	 indicatorOfParameter = 174 ;
 	}
-#Average salinity in the upper 300m
-'Average salinity in the upper 300m' = {
+#Average sea water practical salinity in the upper 300m
+'Average sea water practical salinity in the upper 300m' = {
 	 table2Version = 151 ;
 	 indicatorOfParameter = 175 ;
 	}