Skip to content

Commit 859894a

Browse files
shahramnshahramn
committed
Merge branch release/2.34.0
2 parents 236c5f0 + 957fcab commit 859894a

File tree

2,095 files changed

+71505
-71520
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,095 files changed

+71505
-71520
lines changed

‎.cproject

Lines changed: 0 additions & 132 deletions
This file was deleted.

‎.github/.cmake-options

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
-DENABLE_EXTRA_TESTS=1 -DECCODES_INSTALL_EXTRA_TOOLS=1
1+
-DENABLE_EXTRA_TESTS=1 -DECCODES_INSTALL_EXTRA_TOOLS=1 -DENABLE_PNG=1

‎.github/ci-nightly-test.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ module load netcdf4/new
1212
module load gnuparallel/new
1313
module load python3
1414

15+
version=$(cat $TMPDIR/eccodes/VERSION)
16+
1517
cd ~masn/REGRESSION_TESTING/ecCodes
16-
./par-suite.sh -w $TMPDIR/install/eccodes
18+
./par-suite.sh -w $TMPDIR/install/eccodes/$version
1719

1820
# For debugging specific test(s)
19-
# ./seq-suite.sh -w $TMPDIR/install/eccodes -d -t py_
21+
# ./seq-suite.sh -w $TMPDIR/install/eccodes/$version -d -t py_

‎.project

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎.settings/language.settings.xml

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
Enrico Fucile
22
Shahram Najm
3+
Eugen Betke
34
Sandor Kertesz
45
Sebastien Villaume
56
Florian Rathgeber

‎CMakeLists.txt

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,15 @@ endif()
7474
# some variables/options of this project
7575

7676
if( CMAKE_CXX_COMPILER_ID STREQUAL "GNU" )
77-
ecbuild_add_cxx_flags("-Wno-write-strings -Wno-deprecated")
77+
ecbuild_add_cxx_flags("-Wno-write-strings")
78+
ecbuild_add_cxx_flags("-Wno-deprecated")
7879
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
79-
ecbuild_add_cxx_flags("-Wno-write-strings -Wno-deprecated")
80+
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16)
81+
ecbuild_add_cxx_flags("-Wno-write-strings")
82+
ecbuild_add_cxx_flags("-Wno-deprecated")
83+
else()
84+
ecbuild_add_cxx_flags("-Wno-writable-strings")
85+
endif()
8086
elseif( CMAKE_CXX_COMPILER_ID STREQUAL "Cray" )
8187
set(CMAKE_CXX_FLAGS "-hstd=c++11 ${CMAKE_CXX_FLAGS}")
8288
endif()
@@ -142,9 +148,8 @@ ecbuild_add_option( FEATURE AEC
142148
DEFAULT ON
143149
CONDITION AEC_FOUND )
144150

145-
ecbuild_find_python( VERSION 2.6 NO_LIBS )
146-
find_package( NumPy )
147-
set( HAVE_PYTHON 0 )
151+
ecbuild_find_python( VERSION 3.6 NO_LIBS )
152+
# find_package( NumPy )
148153

149154
## TODO REQUIRED_LANGUAGES Fortran
150155
ecbuild_add_option( FEATURE FORTRAN
@@ -165,7 +170,7 @@ endif()
165170
ecbuild_add_option( FEATURE MEMFS
166171
DESCRIPTION "Memory based access to definitions/samples"
167172
DEFAULT OFF
168-
REQUIRED_PACKAGES PythonInterp )
173+
REQUIRED_PACKAGES Python3 )
169174

170175
#if( HAVE_MEMFS AND "${CMAKE_C_COMPILER_ID}" STREQUAL "Cray")
171176
# set( HAVE_MEMFS OFF )
@@ -478,10 +483,10 @@ endif()
478483

479484
###############################################################################
480485
# Debugging aid. Print all known CMake variables
481-
# get_cmake_property(_variableNames VARIABLES)
482-
# foreach( _variableName ${_variableNames} )
486+
#get_cmake_property(_variableNames VARIABLES)
487+
#foreach( _variableName ${_variableNames} )
483488
# ecbuild_info(" ${_variableName}=${${_variableName}}")
484-
# endforeach()
489+
#endforeach()
485490
###############################################################################
486491
# finalize
487492

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.33.2
1+
2.34.0

‎data/grib_data_files.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,3 +90,5 @@ gfs.complex.mvmu.grib2
9090
mercator.grib2
9191
run_length_packing.grib2
9292
boustrophedonic.grib1
93+
reduced_gaussian_sub_area.legacy.grib1
94+

0 commit comments

Comments
 (0)