Merge release/2.28.0

CMakeLists.txt

@@ -21,7 +21,7 @@ cmake_minimum_required( VERSION 3.12 FATAL_ERROR )
 find_package( ecbuild 3.7 REQUIRED HINTS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../ecbuild)
 
 # Initialise project
-project( eccodes VERSION 2.27.2 LANGUAGES C )
+project( eccodes VERSION 2.28.0 LANGUAGES C )
 
 ###############################################################################
 # system checks needed for eccodes_config.h and some options like MEMFS

README.md

@@ -1,11 +1,11 @@
 ecCodes
 =======
 
-[![Linux & macOS: master](https://img.shields.io/github/workflow/status/ecmwf/eccodes/ci/master?label=Linux-and-macOS-master)](https://github.com/ecmwf/eccodes/actions/workflows/ci.yml?query=branch%3Amaster)
-[![Linux & macOS: develop](https://img.shields.io/github/workflow/status/ecmwf/eccodes/ci/develop?label=Linux-and-macOS-develop)](https://github.com/ecmwf/eccodes/actions/workflows/ci.yml?query=branch%3Adevelop)
+[![Linux & macOS: master](https://img.shields.io/github/actions/workflow/status/ecmwf/eccodes/ci.yml?branch=master&label=Linux%20%26%20MacOS%3A%20master)](https://github.com/ecmwf/eccodes/actions/workflows/ci.yml?query=branch%3Amaster)
+[![Linux & macOS: develop](https://img.shields.io/github/actions/workflow/status/ecmwf/eccodes/ci.yml?branch=develop&label=Linux%20%26%20MacOS%3A%20develop)](https://github.com/ecmwf/eccodes/actions/workflows/ci.yml?query=branch%3Adevelop)
 
-[![Windows: master](https://img.shields.io/appveyor/ci/ecmwf/eccodes/master.svg?label=Windows-master)](https://ci.appveyor.com/project/ecmwf/eccodes/branch/master)
-[![Windows: develop](https://img.shields.io/appveyor/ci/ecmwf/eccodes/develop.svg?label=Windows-dev)](https://ci.appveyor.com/project/ecmwf/eccodes/branch/develop)
+[![Windows: master](https://img.shields.io/appveyor/ci/ecmwf/eccodes/master.svg?label=Windows%3A%20master)](https://ci.appveyor.com/project/ecmwf/eccodes/branch/master)
+[![Windows: develop](https://img.shields.io/appveyor/ci/ecmwf/eccodes/develop.svg?label=Windows%3A%20develop)](https://ci.appveyor.com/project/ecmwf/eccodes/branch/develop)
 
 ecCodes is a package developed by ECMWF which provides an application programming interface
 and a set of tools for decoding and encoding messages in the following formats:

data/bitmap.diff

@@ -15,12 +15,9 @@ GRIB {
   # Unknown code table entry (grib1/0.ecmf.table)  
   subCentre = 0;
   paramId = 130;
-  #-READ ONLY- cfNameECMF = air_temperature;
   #-READ ONLY- cfName = air_temperature;
-  #-READ ONLY- cfVarNameECMF = t;
   #-READ ONLY- cfVarName = t;
   #-READ ONLY- units = K;
-  #-READ ONLY- nameECMF = Temperature;
   #-READ ONLY- name = Temperature;
   decimalScaleFactor = 0;
   dataDate = 20080206;
@@ -141,11 +138,11 @@ GRIB {
   #-READ ONLY- maximum = 224.455;
   #-READ ONLY- minimum = 160.252;
   #-READ ONLY- average = 194.458;
-  #-READ ONLY- numberOfMissing = 0;
   #-READ ONLY- standardDeviation = 12.8976;
   #-READ ONLY- skewness = -0.807543;
   #-READ ONLY- kurtosis = 0.45733;
   #-READ ONLY- isConstant = 0;
+  #-READ ONLY- numberOfMissing = 0;
   gridType = reduced_gg;
   #-READ ONLY- getNumberOfValues = 6114;
 }

data/no_bitmap.diff

@@ -15,12 +15,9 @@ GRIB {
   # Unknown code table entry (grib1/0.ecmf.table)  
   subCentre = 0;
   paramId = 130;
-  #-READ ONLY- cfNameECMF = air_temperature;
   #-READ ONLY- cfName = air_temperature;
-  #-READ ONLY- cfVarNameECMF = t;
   #-READ ONLY- cfVarName = t;
   #-READ ONLY- units = K;
-  #-READ ONLY- nameECMF = Temperature;
   #-READ ONLY- name = Temperature;
   decimalScaleFactor = 0;
   dataDate = 20080206;
@@ -140,11 +137,11 @@ GRIB {
   #-READ ONLY- maximum = 224.455;
   #-READ ONLY- minimum = 160.252;
   #-READ ONLY- average = 194.458;
-  #-READ ONLY- numberOfMissing = 0;
   #-READ ONLY- standardDeviation = 12.8976;
   #-READ ONLY- skewness = -0.807543;
   #-READ ONLY- kurtosis = 0.45733;
   #-READ ONLY- isConstant = 0;
+  #-READ ONLY- numberOfMissing = 0;
   gridType = reduced_gg;
   #-READ ONLY- getNumberOfValues = 6114;
 }

data/tigge_pf_ecmwf.grib2.ref

@@ -3,7 +3,7 @@ ecmf 166 10v m s**-1 10 metre V wind component
 ecmf 59 cape J kg**-1 Convective available potential energy
 ecmf 156 gh gpm Geopotential height
 ecmf 151 msl Pa Mean sea level pressure
-ecmf 179 ttr J m**-2 Top net thermal radiation
+ecmf 179 ttr J m**-2 Top net long-wave (thermal) radiation
 ecmf 3 pt K Potential temperature
 ecmf 60 pv K m**2 kg**-1 s**-1 Potential vorticity
 ecmf 235 skt K Skin temperature
@@ -18,15 +18,15 @@ ecmf 121 mx2t6 K Maximum temperature at 2 metres in the last 6 hours
 ecmf 122 mn2t6 K Minimum temperature at 2 metres in the last 6 hours
 ecmf 167 2t K 2 metre temperature
 ecmf 147 slhf J m**-2 Surface latent heat flux
-ecmf 176 ssr J m**-2 Surface net solar radiation
-ecmf 177 str J m**-2 Surface net thermal radiation
+ecmf 176 ssr J m**-2 Surface net short-wave (solar) radiation
+ecmf 177 str J m**-2 Surface net long-wave (thermal) radiation
 ecmf 134 sp Pa Surface pressure
 ecmf 146 sshf J m**-2 Surface sensible heat flux
 ecmf 130 t K Temperature
-ecmf 179 ttr J m**-2 Top net thermal radiation
+ecmf 179 ttr J m**-2 Top net long-wave (thermal) radiation
 ecmf 147 slhf J m**-2 Surface latent heat flux
-ecmf 176 ssr J m**-2 Surface net solar radiation
-ecmf 177 str J m**-2 Surface net thermal radiation
+ecmf 176 ssr J m**-2 Surface net short-wave (solar) radiation
+ecmf 177 str J m**-2 Surface net long-wave (thermal) radiation
 ecmf 146 sshf J m**-2 Surface sensible heat flux
 ecmf 228164 tcc % Total Cloud Cover
 ecmf 136 tcw kg m**-2 Total column water

definitions/add_params_from_tsv.pl

@@ -27,15 +27,17 @@
 my $SANITY_CHECK     = 0;
 my $WRITE_TO_FILES   = 0;
 my $WRITE_TO_PARAMDB = 0; # Be careful. Fill in $contactId before proceeding
+my $contactId;   # JIRA issue ID
 
 # Process arguments. Must be at least one file
 if (scalar @ARGV < 1) {
   &usage;
 }
 my $result = GetOptions (
-  "s" => \$SANITY_CHECK,
-  "f" => \$WRITE_TO_FILES,
-  "p" => \$WRITE_TO_PARAMDB
+  "s"   => \$SANITY_CHECK,
+  "f"   => \$WRITE_TO_FILES,
+  "p"   => \$WRITE_TO_PARAMDB,
+  "c:s" => \$contactId
   );
 
 $ARGV[0] or &usage;
@@ -78,7 +80,6 @@
 my $centre_wmo   = -3; # WMO centre ID
 my $centre_ecmwf = 98; # ECMWF centre ID
 my $edition = 2; # GRIB edition 2
-my $contactId;   # JIRA issue ID
 
 my $PARAMID_FILENAME   = "paramId.def";
 my $SHORTNAME_FILENAME = "shortName.def";
@@ -391,9 +392,10 @@ sub is_integer {
 sub usage {
    print <<USAGE;
 
-Usage: $0 [-s] [-f] [-p] file.tsv
-       Input has to be a tab-separated values (TSV) file
+Usage: $0 [-c ID] [-s] [-f] [-p] file.tsv
+       Input has to be a tab-separated-values (TSV) file
 
+       -c  The Contact ID (JIRA issue)
        -s  Perform sanity checks and exit
        -f  Write out def files (paramId.def, name.def etc)
        -p  Write to Parameter Database (Be careful!)

definitions/bufr/boot.def

@@ -13,7 +13,7 @@ transient setToMissingIfOutOfRange=0 : hidden;
 
 # This gets updated twice a year by WMO.
 # See https://community.wmo.int/activity-areas/wmo-codes/manual-codes/latest-version
-constant masterTablesVersionNumberLatest = 38;
+constant masterTablesVersionNumberLatest = 39;
 
 #negative value=not used
 transient inputDelayedDescriptorReplicationFactor={-1} : hidden;

definitions/bufr/tables/0/wmo/39/codetables/1003.table

@@ -0,0 +1,8 @@
+0 0 ANTARCTICA
+1 1 REGION I
+2 2 REGION II
+3 3 REGION III
+4 4 REGION IV
+5 5 REGION V
+6 6 REGION VI
+7 7 MISSING VALUE

definitions/bufr/tables/0/wmo/39/codetables/10063.table

@@ -0,0 +1,10 @@
+0 0 INCREASING, THEN DECREASING; ATMOSPHERIC PRESSURE THE SAME OR HIGHER THAN THREE HOURS AGO
+1 1 INCREASING, THEN STEADY; OR INCREASING, THEN INCREASING MORE SLOWLY
+2 2 INCREASING (STEADILY OR UNSTEADILY)
+3 3 DECREASING OR STEADY, THEN INCREASING; OR INCREASING, THEN INCREASING MORE RAPIDLY
+4 4 STEADY; ATMOSPHERIC PRESSURE THE SAME AS THREE HOURS AGO
+5 5 DECREASING, THEN INCREASING; ATMOSPHERIC PRESSURE THE SAME OR LOWER THAN THREE HOURS AGO
+6 6 DECREASING, THEN STEADY; OR DECREASING, THEN DECREASING MORE SLOWLY
+7 7 DECREASING (STEADILY OR UNSTEADILY)
+8 8 STEADY OR INCREASING, THEN DECREASING; OR DECREASING, THEN DECREASING MORE RAPIDLY
+15 15 MISSING VALUE

definitions/bufr/tables/0/wmo/39/codetables/10064.table

@@ -0,0 +1,4 @@
+0 0 SUBSONIC
+1 1 TRANSONIC
+2 2 SUPERSONIC
+7 7 MISSING VALUE