mirror of https://github.com/ecmwf/eccodes.git
Merge release/2.28.0
This commit is contained in:
Shahram Najm
commit
03a4ec5c99
|
|
@ -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)
|
find_package( ecbuild 3.7 REQUIRED HINTS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../ecbuild)
|
||||||
|
|
||||||
# Initialise project
|
# 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
|
# system checks needed for eccodes_config.h and some options like MEMFS
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
ecCodes
|
ecCodes
|
||||||
=======
|
=======
|
||||||
|
|
||||||
[](https://github.com/ecmwf/eccodes/actions/workflows/ci.yml?query=branch%3Amaster)
|
[](https://github.com/ecmwf/eccodes/actions/workflows/ci.yml?query=branch%3Amaster)
|
||||||
[](https://github.com/ecmwf/eccodes/actions/workflows/ci.yml?query=branch%3Adevelop)
|
[](https://github.com/ecmwf/eccodes/actions/workflows/ci.yml?query=branch%3Adevelop)
|
||||||
|
|
||||||
[](https://ci.appveyor.com/project/ecmwf/eccodes/branch/master)
|
[](https://ci.appveyor.com/project/ecmwf/eccodes/branch/master)
|
||||||
[](https://ci.appveyor.com/project/ecmwf/eccodes/branch/develop)
|
[](https://ci.appveyor.com/project/ecmwf/eccodes/branch/develop)
|
||||||
|
|
||||||
ecCodes is a package developed by ECMWF which provides an application programming interface
|
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:
|
and a set of tools for decoding and encoding messages in the following formats:
|
||||||
|
|
|
||||||
|
|
@ -15,12 +15,9 @@ GRIB {
|
||||||
# Unknown code table entry (grib1/0.ecmf.table)
|
# Unknown code table entry (grib1/0.ecmf.table)
|
||||||
subCentre = 0;
|
subCentre = 0;
|
||||||
paramId = 130;
|
paramId = 130;
|
||||||
#-READ ONLY- cfNameECMF = air_temperature;
|
|
||||||
#-READ ONLY- cfName = air_temperature;
|
#-READ ONLY- cfName = air_temperature;
|
||||||
#-READ ONLY- cfVarNameECMF = t;
|
|
||||||
#-READ ONLY- cfVarName = t;
|
#-READ ONLY- cfVarName = t;
|
||||||
#-READ ONLY- units = K;
|
#-READ ONLY- units = K;
|
||||||
#-READ ONLY- nameECMF = Temperature;
|
|
||||||
#-READ ONLY- name = Temperature;
|
#-READ ONLY- name = Temperature;
|
||||||
decimalScaleFactor = 0;
|
decimalScaleFactor = 0;
|
||||||
dataDate = 20080206;
|
dataDate = 20080206;
|
||||||
|
|
@ -141,11 +138,11 @@ GRIB {
|
||||||
#-READ ONLY- maximum = 224.455;
|
#-READ ONLY- maximum = 224.455;
|
||||||
#-READ ONLY- minimum = 160.252;
|
#-READ ONLY- minimum = 160.252;
|
||||||
#-READ ONLY- average = 194.458;
|
#-READ ONLY- average = 194.458;
|
||||||
#-READ ONLY- numberOfMissing = 0;
|
|
||||||
#-READ ONLY- standardDeviation = 12.8976;
|
#-READ ONLY- standardDeviation = 12.8976;
|
||||||
#-READ ONLY- skewness = -0.807543;
|
#-READ ONLY- skewness = -0.807543;
|
||||||
#-READ ONLY- kurtosis = 0.45733;
|
#-READ ONLY- kurtosis = 0.45733;
|
||||||
#-READ ONLY- isConstant = 0;
|
#-READ ONLY- isConstant = 0;
|
||||||
|
#-READ ONLY- numberOfMissing = 0;
|
||||||
gridType = reduced_gg;
|
gridType = reduced_gg;
|
||||||
#-READ ONLY- getNumberOfValues = 6114;
|
#-READ ONLY- getNumberOfValues = 6114;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -15,12 +15,9 @@ GRIB {
|
||||||
# Unknown code table entry (grib1/0.ecmf.table)
|
# Unknown code table entry (grib1/0.ecmf.table)
|
||||||
subCentre = 0;
|
subCentre = 0;
|
||||||
paramId = 130;
|
paramId = 130;
|
||||||
#-READ ONLY- cfNameECMF = air_temperature;
|
|
||||||
#-READ ONLY- cfName = air_temperature;
|
#-READ ONLY- cfName = air_temperature;
|
||||||
#-READ ONLY- cfVarNameECMF = t;
|
|
||||||
#-READ ONLY- cfVarName = t;
|
#-READ ONLY- cfVarName = t;
|
||||||
#-READ ONLY- units = K;
|
#-READ ONLY- units = K;
|
||||||
#-READ ONLY- nameECMF = Temperature;
|
|
||||||
#-READ ONLY- name = Temperature;
|
#-READ ONLY- name = Temperature;
|
||||||
decimalScaleFactor = 0;
|
decimalScaleFactor = 0;
|
||||||
dataDate = 20080206;
|
dataDate = 20080206;
|
||||||
|
|
@ -140,11 +137,11 @@ GRIB {
|
||||||
#-READ ONLY- maximum = 224.455;
|
#-READ ONLY- maximum = 224.455;
|
||||||
#-READ ONLY- minimum = 160.252;
|
#-READ ONLY- minimum = 160.252;
|
||||||
#-READ ONLY- average = 194.458;
|
#-READ ONLY- average = 194.458;
|
||||||
#-READ ONLY- numberOfMissing = 0;
|
|
||||||
#-READ ONLY- standardDeviation = 12.8976;
|
#-READ ONLY- standardDeviation = 12.8976;
|
||||||
#-READ ONLY- skewness = -0.807543;
|
#-READ ONLY- skewness = -0.807543;
|
||||||
#-READ ONLY- kurtosis = 0.45733;
|
#-READ ONLY- kurtosis = 0.45733;
|
||||||
#-READ ONLY- isConstant = 0;
|
#-READ ONLY- isConstant = 0;
|
||||||
|
#-READ ONLY- numberOfMissing = 0;
|
||||||
gridType = reduced_gg;
|
gridType = reduced_gg;
|
||||||
#-READ ONLY- getNumberOfValues = 6114;
|
#-READ ONLY- getNumberOfValues = 6114;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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 59 cape J kg**-1 Convective available potential energy
|
||||||
ecmf 156 gh gpm Geopotential height
|
ecmf 156 gh gpm Geopotential height
|
||||||
ecmf 151 msl Pa Mean sea level pressure
|
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 3 pt K Potential temperature
|
||||||
ecmf 60 pv K m**2 kg**-1 s**-1 Potential vorticity
|
ecmf 60 pv K m**2 kg**-1 s**-1 Potential vorticity
|
||||||
ecmf 235 skt K Skin temperature
|
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 122 mn2t6 K Minimum temperature at 2 metres in the last 6 hours
|
||||||
ecmf 167 2t K 2 metre temperature
|
ecmf 167 2t K 2 metre temperature
|
||||||
ecmf 147 slhf J m**-2 Surface latent heat flux
|
ecmf 147 slhf J m**-2 Surface latent heat flux
|
||||||
ecmf 176 ssr J m**-2 Surface net solar radiation
|
ecmf 176 ssr J m**-2 Surface net short-wave (solar) radiation
|
||||||
ecmf 177 str J m**-2 Surface net thermal radiation
|
ecmf 177 str J m**-2 Surface net long-wave (thermal) radiation
|
||||||
ecmf 134 sp Pa Surface pressure
|
ecmf 134 sp Pa Surface pressure
|
||||||
ecmf 146 sshf J m**-2 Surface sensible heat flux
|
ecmf 146 sshf J m**-2 Surface sensible heat flux
|
||||||
ecmf 130 t K Temperature
|
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 147 slhf J m**-2 Surface latent heat flux
|
||||||
ecmf 176 ssr J m**-2 Surface net solar radiation
|
ecmf 176 ssr J m**-2 Surface net short-wave (solar) radiation
|
||||||
ecmf 177 str J m**-2 Surface net thermal radiation
|
ecmf 177 str J m**-2 Surface net long-wave (thermal) radiation
|
||||||
ecmf 146 sshf J m**-2 Surface sensible heat flux
|
ecmf 146 sshf J m**-2 Surface sensible heat flux
|
||||||
ecmf 228164 tcc % Total Cloud Cover
|
ecmf 228164 tcc % Total Cloud Cover
|
||||||
ecmf 136 tcw kg m**-2 Total column water
|
ecmf 136 tcw kg m**-2 Total column water
|
||||||
|
|
|
||||||
|
|
@ -27,15 +27,17 @@ use Getopt::Long;
|
||||||
my $SANITY_CHECK = 0;
|
my $SANITY_CHECK = 0;
|
||||||
my $WRITE_TO_FILES = 0;
|
my $WRITE_TO_FILES = 0;
|
||||||
my $WRITE_TO_PARAMDB = 0; # Be careful. Fill in $contactId before proceeding
|
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
|
# Process arguments. Must be at least one file
|
||||||
if (scalar @ARGV < 1) {
|
if (scalar @ARGV < 1) {
|
||||||
&usage;
|
&usage;
|
||||||
}
|
}
|
||||||
my $result = GetOptions (
|
my $result = GetOptions (
|
||||||
"s" => \$SANITY_CHECK,
|
"s" => \$SANITY_CHECK,
|
||||||
"f" => \$WRITE_TO_FILES,
|
"f" => \$WRITE_TO_FILES,
|
||||||
"p" => \$WRITE_TO_PARAMDB
|
"p" => \$WRITE_TO_PARAMDB,
|
||||||
|
"c:s" => \$contactId
|
||||||
);
|
);
|
||||||
|
|
||||||
$ARGV[0] or &usage;
|
$ARGV[0] or &usage;
|
||||||
|
|
@ -78,7 +80,6 @@ my $dbh = 0;
|
||||||
my $centre_wmo = -3; # WMO centre ID
|
my $centre_wmo = -3; # WMO centre ID
|
||||||
my $centre_ecmwf = 98; # ECMWF centre ID
|
my $centre_ecmwf = 98; # ECMWF centre ID
|
||||||
my $edition = 2; # GRIB edition 2
|
my $edition = 2; # GRIB edition 2
|
||||||
my $contactId; # JIRA issue ID
|
|
||||||
|
|
||||||
my $PARAMID_FILENAME = "paramId.def";
|
my $PARAMID_FILENAME = "paramId.def";
|
||||||
my $SHORTNAME_FILENAME = "shortName.def";
|
my $SHORTNAME_FILENAME = "shortName.def";
|
||||||
|
|
@ -391,9 +392,10 @@ sub is_integer {
|
||||||
sub usage {
|
sub usage {
|
||||||
print <<USAGE;
|
print <<USAGE;
|
||||||
|
|
||||||
Usage: $0 [-s] [-f] [-p] file.tsv
|
Usage: $0 [-c ID] [-s] [-f] [-p] file.tsv
|
||||||
Input has to be a tab-separated values (TSV) file
|
Input has to be a tab-separated-values (TSV) file
|
||||||
|
|
||||||
|
-c The Contact ID (JIRA issue)
|
||||||
-s Perform sanity checks and exit
|
-s Perform sanity checks and exit
|
||||||
-f Write out def files (paramId.def, name.def etc)
|
-f Write out def files (paramId.def, name.def etc)
|
||||||
-p Write to Parameter Database (Be careful!)
|
-p Write to Parameter Database (Be careful!)
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ transient setToMissingIfOutOfRange=0 : hidden;
|
||||||
|
|
||||||
# This gets updated twice a year by WMO.
|
# This gets updated twice a year by WMO.
|
||||||
# See https://community.wmo.int/activity-areas/wmo-codes/manual-codes/latest-version
|
# See https://community.wmo.int/activity-areas/wmo-codes/manual-codes/latest-version
|
||||||
constant masterTablesVersionNumberLatest = 38;
|
constant masterTablesVersionNumberLatest = 39;
|
||||||
|
|
||||||
#negative value=not used
|
#negative value=not used
|
||||||
transient inputDelayedDescriptorReplicationFactor={-1} : hidden;
|
transient inputDelayedDescriptorReplicationFactor={-1} : hidden;
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue