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

Merge branch 'develop' into bugfix/ECC-1150-missing-limits

This commit is contained in:
Shahram Najm 2020-10-01 12:20:58 +01:00
parent 238bad66ca 5f0a6311dd
commit f70ee4b49c
4 changed files with 5 additions and 1122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.appveyor.yml
View File

@ -38,7 +38,7 @@ clone_depth: 1
# scripts that run after cloning repository # scripts that run after cloning repository
install: install:
# install ecbuild # install ecbuild
- cmd: git clone --depth 1 https://github.com/ecmwf/ecbuild.git %ECBUILD_SRC% - cmd: git clone --depth 1 https://github.com/ecmwf/ecbuild.git %ECBUILD_SRC% --branch %APPVEYOR_REPO_BRANCH%
# install linux utils # install linux utils
- cmd: conda install -c msys2 m2-bash ^ - cmd: conda install -c msys2 m2-bash ^

2
.travis.yml
View File

@ -43,7 +43,7 @@ before_install:
install: install:
# install ecbuild # install ecbuild
- git clone --depth 1 https://github.com/ecmwf/ecbuild.git ${ECBUILD_SRC} - git clone --depth 1 https://github.com/ecmwf/ecbuild.git ${ECBUILD_SRC} --branch ${TRAVIS_BRANCH}
#---------------------------------# #---------------------------------#
# build configuration # # build configuration #

6
CMakeLists.txt
View File

@ -425,10 +425,10 @@ add_subdirectory( ifs_samples ) # must come after samples
# ecbuild_dont_pack( DIRS samples DONT_PACK_REGEX "*.grib" ) # ecbuild_dont_pack( DIRS samples DONT_PACK_REGEX "*.grib" )
ecbuild_dont_pack( DIRS ecbuild_dont_pack( DIRS
concepts tests.ecmwf doxygen confluence examples.dev templates parameters java concepts tests.ecmwf doxygen confluence templates parameters java
perl config m4 rpms gaussian_experimental gribex examples/F77 perl config m4 rpms gaussian_experimental gribex examples/F77
examples/extra examples/deprecated bamboo fortran/fortranCtypes tigge/tools examples/examples.dev examples/extra examples/deprecated bamboo
share/eccodes .settings ) fortran/fortranCtypes tigge/tools share/eccodes .settings )
#ecbuild_dont_pack( DIRS data/bufr DONT_PACK_REGEX "*.bufr" ) #ecbuild_dont_pack( DIRS data/bufr DONT_PACK_REGEX "*.bufr" )
#ecbuild_dont_pack( DIRS data/tigge DONT_PACK_REGEX "*.grib" ) #ecbuild_dont_pack( DIRS data/tigge DONT_PACK_REGEX "*.grib" )

1117
concepts/grib1_short_name
View File

File diff suppressed because it is too large Load Diff