Merge branch release/2.34.0

ecmwf · Feb 6, 2024 · 859894a · 859894a
2 parents 236c5f0 + 957fcab
commit 859894a
Show file tree

Hide file tree

Showing 2,095 changed files with 71,505 additions and 71,520 deletions.
diff --git a/.cproject b/.cproject
diff --git a/.github/.cmake-options b/.github/.cmake-options
@@ -1 +1 @@
--DENABLE_EXTRA_TESTS=1 -DECCODES_INSTALL_EXTRA_TOOLS=1
+-DENABLE_EXTRA_TESTS=1 -DECCODES_INSTALL_EXTRA_TOOLS=1 -DENABLE_PNG=1
diff --git a/.github/ci-nightly-test.sh b/.github/ci-nightly-test.sh
@@ -12,8 +12,10 @@ module load netcdf4/new
 module load gnuparallel/new
 module load python3
 
+version=$(cat $TMPDIR/eccodes/VERSION)
+
 cd ~masn/REGRESSION_TESTING/ecCodes
-./par-suite.sh -w $TMPDIR/install/eccodes
+./par-suite.sh -w $TMPDIR/install/eccodes/$version
 
 # For debugging specific test(s)
-# ./seq-suite.sh -w $TMPDIR/install/eccodes -d -t py_
+# ./seq-suite.sh -w $TMPDIR/install/eccodes/$version -d -t py_
diff --git a/.project b/.project
diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
diff --git a/AUTHORS b/AUTHORS
@@ -1,5 +1,6 @@
 Enrico Fucile
 Shahram Najm
+Eugen Betke
 Sandor Kertesz
 Sebastien Villaume
 Florian Rathgeber

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -74,9 +74,15 @@ endif()
 # some variables/options of this project
 
 if( CMAKE_CXX_COMPILER_ID STREQUAL "GNU" )
-    ecbuild_add_cxx_flags("-Wno-write-strings -Wno-deprecated")
+    ecbuild_add_cxx_flags("-Wno-write-strings")
+    ecbuild_add_cxx_flags("-Wno-deprecated")
 elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
-    ecbuild_add_cxx_flags("-Wno-write-strings -Wno-deprecated")
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16)
+        ecbuild_add_cxx_flags("-Wno-write-strings")
+        ecbuild_add_cxx_flags("-Wno-deprecated")
+    else()
+        ecbuild_add_cxx_flags("-Wno-writable-strings")
+    endif()
 elseif( CMAKE_CXX_COMPILER_ID STREQUAL "Cray" )
     set(CMAKE_CXX_FLAGS "-hstd=c++11 ${CMAKE_CXX_FLAGS}")
 endif()
@@ -142,9 +148,8 @@ ecbuild_add_option( FEATURE AEC
     DEFAULT ON
     CONDITION AEC_FOUND )
 
-ecbuild_find_python( VERSION 2.6 NO_LIBS )
-find_package( NumPy )
-set( HAVE_PYTHON 0 )
+ecbuild_find_python( VERSION 3.6 NO_LIBS )
+# find_package( NumPy )
 
 ## TODO REQUIRED_LANGUAGES Fortran
 ecbuild_add_option( FEATURE FORTRAN
@@ -165,7 +170,7 @@ endif()
 ecbuild_add_option( FEATURE MEMFS
     DESCRIPTION "Memory based access to definitions/samples"
     DEFAULT OFF
-    REQUIRED_PACKAGES PythonInterp )
+    REQUIRED_PACKAGES Python3 )
 
 #if( HAVE_MEMFS AND "${CMAKE_C_COMPILER_ID}" STREQUAL "Cray")
 #  set( HAVE_MEMFS OFF )
@@ -478,10 +483,10 @@ endif()
 
 ###############################################################################
 # Debugging aid. Print all known CMake variables
-# get_cmake_property(_variableNames VARIABLES)
-# foreach( _variableName ${_variableNames} )
+#get_cmake_property(_variableNames VARIABLES)
+#foreach( _variableName ${_variableNames} )
 #   ecbuild_info("  ${_variableName}=${${_variableName}}")
-# endforeach()
+#endforeach()
 ###############################################################################
 # finalize
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.33.2
+2.34.0
diff --git a/data/grib_data_files.txt b/data/grib_data_files.txt
@@ -90,3 +90,5 @@ gfs.complex.mvmu.grib2
 mercator.grib2
 run_length_packing.grib2
 boustrophedonic.grib1
+reduced_gaussian_sub_area.legacy.grib1
+