core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix/2.12.2'

This commit is contained in:
Shahram Najm 2019-03-20 17:42:36 +00:00
parent ffa02faacf a95f8f0995
commit ef7e994d25
21 changed files with 64 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.appveyor.yml
View File

@ -2,7 +2,7 @@
# general configuration #
#---------------------------------#
version: 2.11.0-{build}-{branch}
version: 2.12.2-{build}-{branch}
branches:
only:

15
CMakeLists.txt
View File

@ -351,6 +351,21 @@ get_directory_property( COMPILE_DEFINITIONS ECCODES_DEFINITIONS )
foreach( _tpl ${ECCODES_TPLS} )
string( TOUPPER ${_tpl} TPL )
if( ${TPL}_FOUND )
if( REPLACE_TPL_ABSOLUTE_PATHS )
# replace TPL absolute paths with their library names
# this helps make ecCodes relocatable
set( _TMP "" )
foreach( _lib ${${TPL}_LIBRARIES} )
get_filename_component( _lib_name ${_lib} NAME_WE )
string( REGEX REPLACE "^lib" "" _name ${_lib_name} )
list( APPEND _TMP "-l${_name}" )
endforeach()
set( ${TPL}_LIBRARIES ${_TMP} )
set( _TMP "" )
endif()
list( APPEND ECCODES_EXTRA_DEFINITIONS ${${TPL}_DEFINITIONS} )
list( APPEND ECCODES_EXTRA_INCLUDE_DIRS ${${TPL}_INCLUDE_DIRS} ${${TPL}_INCLUDE_DIR} )
list( APPEND ECCODES_EXTRA_LIBRARIES ${${TPL}_LIBRARIES} )

2
VERSION.cmake
View File

@ -1 +1 @@
set( ${PROJECT_NAME}_VERSION_STR "2.12.1" )
set( ${PROJECT_NAME}_VERSION_STR "2.12.2" )

2
definitions/mars/grib.edmm.an.def
View File

@ -4,3 +4,5 @@
alias mars.step = startStep;
alias mars.number=perturbationNumber;
alias monthlyVerificationTime = validityTime;
alias monthlyVerificationDate = dataDate;

2
definitions/mars/grib.edmm.fc.def
View File

@ -8,6 +8,8 @@ meta monthlyVerificationYear evaluate(monthlyVerificationDate/10000);
meta verificationMonth evaluate( (verificationDate/100)%100 );
meta monthlyVerificationMonth evaluate( (monthlyVerificationDate/100)%100 );
alias monthlyVerificationTime = validityTime;
# class e4
# constant six = 6;

3
definitions/mars/grib.edmo.an.def
View File

@ -1,6 +1,9 @@
# NOTE: MARS step is startStep. See GRIB-378
alias mars.step = startStep;
alias monthlyVerificationTime = zero;
alias monthlyVerificationDate = dataDate;
# class 3 is "er" which is 15 year re-analysis (ERA15)
# Only ERA15 has time and step
if(class != 3) {

2
definitions/mars/grib.edmo.fc.def
View File

@ -9,6 +9,8 @@ meta monthlyVerificationYear evaluate(monthlyVerificationDate/10000);
meta verificationMonth evaluate( (verificationDate/100)%100 );
meta monthlyVerificationMonth evaluate( (monthlyVerificationDate/100)%100 );
alias monthlyVerificationTime = zero;
# class 3 is "er" which is 15 year re-analysis (ERA15)
# Only ERA15 has time and step
if(class != 3) {

3
definitions/mars/grib.ewmm.an.def
View File

@ -1,2 +1,5 @@
alias mars.step = startStep;
alias mars.number=perturbationNumber;
alias monthlyVerificationTime = validityTime;
alias monthlyVerificationDate = dataDate;

2
definitions/mars/grib.ewmm.fc.def
View File

@ -8,6 +8,8 @@ meta monthlyVerificationYear evaluate(monthlyVerificationDate/10000);
meta verificationMonth evaluate( (verificationDate/100)%100 );
meta monthlyVerificationMonth evaluate( (monthlyVerificationDate/100)%100 );
alias monthlyVerificationTime = validityTime;
#
# See GRIB-422, GRIB-497, GRIB-766, GRIB-833
#

3
definitions/mars/grib.ewmo.an.def
View File

@ -1,6 +1,9 @@
# NOTE: step is startStep
alias mars.step = startStep;
alias monthlyVerificationTime = zero;
alias monthlyVerificationDate = dataDate;
# class 3 is "er" which is 15 year re-analysis (ERA15)
# Only ERA15 has time and step
if(class != 3) {

2
definitions/mars/grib.ewmo.fc.def
View File

@ -9,6 +9,8 @@ meta monthlyVerificationYear evaluate(monthlyVerificationDate/10000);
meta verificationMonth evaluate( (verificationDate/100)%100 );
meta monthlyVerificationMonth evaluate( (monthlyVerificationDate/100)%100 );
alias monthlyVerificationTime = zero;
# class 3 is "er" which is 15 year re-analysis (ERA15)
# Only ERA15 has time and step
if(class != 3) {

3
definitions/mars/grib.mnth.an.def
View File

@ -1,2 +1,5 @@
# class e4
alias mars.step = startStep;
alias monthlyVerificationTime = validityTime;
alias monthlyVerificationDate = dataDate;

4
definitions/mars/grib.mnth.fc.def
View File

@ -7,7 +7,9 @@ meta verificationYear evaluate(verificationDate/10000);
meta monthlyVerificationYear evaluate(monthlyVerificationDate/10000);
meta verificationMonth evaluate( (verificationDate/100)%100 );
meta monthlyVerificationMonth evaluate( (monthlyVerificationDate/100)%100 );
#
alias monthlyVerificationTime = validityTime;
# See GRIB-497, GRIB-766, GRIB-833
#
if (class is "em" || class is "e2" || class is "ea" || class is "ep" ||

3
definitions/mars/grib.moda.an.def
View File

@ -2,6 +2,9 @@
alias mars.step = startStep;
alias monthlyVerificationTime = zero;
alias monthlyVerificationDate = dataDate;
# class 3 is "er" which is 15 year re-analysis (ERA15)
# Only ERA15 has time and step
if(class != 3) {

2
definitions/mars/grib.moda.fc.def
View File

@ -4,6 +4,8 @@ meta verificationDate g1verificationdate(dataDate, dataTime, endStep) : r
meta monthlyVerificationDate g1monthlydate(verificationDate) : dump,no_copy;
alias mars.date = monthlyVerificationDate;
alias monthlyVerificationTime = zero;
meta verificationYear evaluate(verificationDate/10000);
meta monthlyVerificationYear evaluate(monthlyVerificationDate/10000);
meta verificationMonth evaluate( (verificationDate/100)%100 );

3
definitions/mars/grib.wamd.an.def
View File

@ -2,6 +2,9 @@
alias mars.step = startStep;
alias monthlyVerificationTime = zero;
alias monthlyVerificationDate = dataDate;
# class 3 is "er" which is 15 year re-analysis (ERA15)
# Only ERA15 has time and step
if(class != 3) {

2
definitions/mars/grib.wamd.fc.def
View File

@ -4,6 +4,8 @@ meta verificationDate g1verificationdate(dataDate, dataTime, endStep) : r
meta monthlyVerificationDate g1monthlydate(verificationDate) : dump,no_copy;
alias mars.date = monthlyVerificationDate;
alias monthlyVerificationTime = zero;
meta verificationYear evaluate(verificationDate/10000);
meta monthlyVerificationYear evaluate(monthlyVerificationDate/10000);
meta verificationMonth evaluate( (verificationDate/100)%100 );

3
definitions/mars/grib.wamo.an.def
View File

@ -1 +1,4 @@
alias mars.step = startStep;
alias monthlyVerificationTime = validityTime;
alias monthlyVerificationDate = dataDate;

2
definitions/mars/grib.wamo.fc.def
View File

@ -8,6 +8,8 @@ meta monthlyVerificationYear evaluate(monthlyVerificationDate/10000);
meta verificationMonth evaluate( (verificationDate/100)%100 );
meta monthlyVerificationMonth evaluate( (monthlyVerificationDate/100)%100 );
alias monthlyVerificationTime = validityTime;
#
# See GRIB-497, GRIB-766, GRIB-833
#

8
src/grib_util.c
View File

@ -1280,9 +1280,13 @@ grib_handle* grib_util_set_spec2(grib_handle* h,
break;
}
}
if (!strcmp(input_packing_type,"grid_simple_matrix")) {
if (strcmp(input_packing_type,"grid_simple_matrix")==0) {
long numberOfDirections,numberOfFrequencies;
if (h->context->keep_matrix) {
int keep_matrix = h->context->keep_matrix;
if (packing_spec->packing_type == GRIB_UTIL_PACKING_TYPE_GRID_SIMPLE) {
keep_matrix = 0; /* ECC-911 */
}
if (keep_matrix) {
int ret;
SET_STRING_VALUE("packingType","grid_simple_matrix");
ret=grib_get_long(h,"numberOfDirections",&numberOfDirections);

2
version.sh
View File

@ -15,7 +15,7 @@ PACKAGE_NAME='eccodes'
# Package version
ECCODES_MAJOR_VERSION=2
ECCODES_MINOR_VERSION=12
ECCODES_REVISION_VERSION=1
ECCODES_REVISION_VERSION=2
ECCODES_CURRENT=1
ECCODES_REVISION=0